import velocity-1.7-38.el9

3 years ago · 5d4b5009be
commit 5d4b5009be
8 changed files with 1344 additions and 0 deletions
--- a/.gitignore
+++ b/.gitignore
@ -0,0 +1 @@
+SOURCES/velocity-1.7.tar.gz
--- a/.velocity.metadata
+++ b/.velocity.metadata
@ -0,0 +1 @@
+ac76c23153cd2214591b6783f255ad210467b2f8 SOURCES/velocity-1.7.tar.gz
--- a/SOURCES/0001-Port-to-apache-commons-lang3.patch
+++ b/SOURCES/0001-Port-to-apache-commons-lang3.patch
@ -0,0 +1,464 @@
+From bf0462e3c293863947dde1c22a62c3d4a187a70c Mon Sep 17 00:00:00 2001
+From: Marian Koncek <mkoncek@redhat.com>
+Date: Thu, 31 Oct 2019 14:35:40 +0100
+Subject: [PATCH 1/2] Port to apache-commons-lang3
+
+---
+ pom.xml                                                     | 6 +++---
+ .../velocity/app/event/implement/EscapeHtmlReference.java   | 4 ++--
+ .../app/event/implement/EscapeJavaScriptReference.java      | 4 ++--
+ .../velocity/app/event/implement/EscapeSqlReference.java    | 5 +++--
+ .../velocity/app/event/implement/EscapeXmlReference.java    | 2 +-
+ src/java/org/apache/velocity/runtime/RuntimeInstance.java   | 2 +-
+ .../org/apache/velocity/runtime/VelocimacroFactory.java     | 2 +-
+ src/java/org/apache/velocity/runtime/directive/Block.java   | 2 +-
+ .../org/apache/velocity/runtime/directive/RuntimeMacro.java | 2 +-
+ src/java/org/apache/velocity/runtime/parser/Parser.java     | 2 +-
+ .../apache/velocity/runtime/parser/ParserTokenManager.java  | 2 +-
+ .../apache/velocity/runtime/parser/node/ASTDirective.java   | 2 +-
+ .../org/apache/velocity/runtime/parser/node/ASTMethod.java  | 4 ++--
+ .../velocity/runtime/parser/node/ASTStringLiteral.java      | 2 +-
+ .../org/apache/velocity/runtime/parser/node/NodeUtils.java  | 2 +-
+ .../velocity/runtime/parser/node/PropertyExecutor.java      | 2 +-
+ .../velocity/runtime/parser/node/SetPropertyExecutor.java   | 4 ++--
+ .../org/apache/velocity/runtime/parser/node/SimpleNode.java | 4 ++--
+ .../velocity/runtime/resource/ResourceManagerImpl.java      | 4 ++--
+ .../runtime/resource/loader/ClasspathResourceLoader.java    | 2 +-
+ .../runtime/resource/loader/DataSourceResourceLoader.java   | 2 +-
+ .../runtime/resource/loader/FileResourceLoader.java         | 2 +-
+ .../velocity/runtime/resource/loader/JarResourceLoader.java | 2 +-
+ .../runtime/resource/loader/StringResourceLoader.java       | 2 +-
+ .../velocity/runtime/resource/loader/URLResourceLoader.java | 2 +-
+ .../org/apache/velocity/util/introspection/ClassMap.java    | 2 +-
+ .../org/apache/velocity/io/UnicodeInputStreamTestCase.java  | 2 +-
+ src/test/org/apache/velocity/test/BaseTestCase.java         | 2 +-
+ .../org/apache/velocity/test/MethodCacheKeyTestCase.java    | 2 +-
+ 29 files changed, 39 insertions(+), 38 deletions(-)
+
+diff --git a/pom.xml b/pom.xml
+index 77a8e383..eee15b34 100644
+--- a/pom.xml
+++ b/pom.xml
+@@ -148,9 +148,9 @@
+       <version>3.2.1</version>
+     </dependency>
+     <dependency>
+-      <groupId>commons-lang</groupId>
+-      <artifactId>commons-lang</artifactId>
+-      <version>2.4</version>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
+      <version>3.9</version>
+     </dependency>
+     <dependency>
+       <groupId>oro</groupId>
+diff --git a/src/java/org/apache/velocity/app/event/implement/EscapeHtmlReference.java b/src/java/org/apache/velocity/app/event/implement/EscapeHtmlReference.java
+index 6d98b45c..e1469957 100644
+--- a/src/java/org/apache/velocity/app/event/implement/EscapeHtmlReference.java
+++ b/src/java/org/apache/velocity/app/event/implement/EscapeHtmlReference.java
+@@ -19,7 +19,7 @@ package org.apache.velocity.app.event.implement;
+  * under the License.    
+  */
+ 
+-import org.apache.commons.lang.StringEscapeUtils;
+import org.apache.commons.lang3.StringEscapeUtils;
+ 
+ /**
+  * Escape all HTML entities.
+@@ -39,7 +39,7 @@ public class EscapeHtmlReference extends EscapeReference
+      */
+     protected String escape(Object text)
+     {
+-        return StringEscapeUtils.escapeHtml(text.toString());
+        return StringEscapeUtils.escapeHtml4(text.toString());
+     }
+ 
+     /**
+diff --git a/src/java/org/apache/velocity/app/event/implement/EscapeJavaScriptReference.java b/src/java/org/apache/velocity/app/event/implement/EscapeJavaScriptReference.java
+index ea49ddbf..12f38f47 100644
+--- a/src/java/org/apache/velocity/app/event/implement/EscapeJavaScriptReference.java
+++ b/src/java/org/apache/velocity/app/event/implement/EscapeJavaScriptReference.java
+@@ -19,7 +19,7 @@ package org.apache.velocity.app.event.implement;
+  * under the License.    
+  */
+ 
+-import org.apache.commons.lang.StringEscapeUtils;
+import org.apache.commons.lang3.StringEscapeUtils;
+ 
+ /**
+  * Escapes the characters in a String to be suitable for use in JavaScript.
+@@ -39,7 +39,7 @@ public class EscapeJavaScriptReference extends EscapeReference
+      */
+     protected String escape(Object text)
+     {
+-        return StringEscapeUtils.escapeJavaScript(text.toString());
+        return StringEscapeUtils.escapeEcmaScript(text.toString());
+     }
+ 
+     /**
+diff --git a/src/java/org/apache/velocity/app/event/implement/EscapeSqlReference.java b/src/java/org/apache/velocity/app/event/implement/EscapeSqlReference.java
+index 585cb6c6..39e04f43 100644
+--- a/src/java/org/apache/velocity/app/event/implement/EscapeSqlReference.java
+++ b/src/java/org/apache/velocity/app/event/implement/EscapeSqlReference.java
+@@ -19,7 +19,7 @@ package org.apache.velocity.app.event.implement;
+  * under the License.    
+  */
+ 
+-import org.apache.commons.lang.StringEscapeUtils;
+import org.apache.commons.lang3.StringUtils;
+ 
+ /**
+  * Escapes the characters in a String to be suitable to pass to an SQL query.
+@@ -39,7 +39,8 @@ public class EscapeSqlReference extends EscapeReference
+      */
+     protected String escape(Object text)
+     {
+-        return StringEscapeUtils.escapeSql(text.toString());
+        // See https://commons.apache.org/proper/commons-lang/javadocs/api-2.6/org/apache/commons/lang/StringEscapeUtils.html#escapeSql(java.lang.String)
+        return StringUtils.replace(text.toString(), "'", "''");
+     }
+ 
+     /**
+diff --git a/src/java/org/apache/velocity/app/event/implement/EscapeXmlReference.java b/src/java/org/apache/velocity/app/event/implement/EscapeXmlReference.java
+index 3d5b40f0..fbb525cb 100644
+--- a/src/java/org/apache/velocity/app/event/implement/EscapeXmlReference.java
+++ b/src/java/org/apache/velocity/app/event/implement/EscapeXmlReference.java
+@@ -19,7 +19,7 @@ package org.apache.velocity.app.event.implement;
+  * under the License.    
+  */
+ 
+-import org.apache.commons.lang.StringEscapeUtils;
+import org.apache.commons.lang3.StringEscapeUtils;
+ 
+ /**
+  * Escape all XML entities.
+diff --git a/src/java/org/apache/velocity/runtime/RuntimeInstance.java b/src/java/org/apache/velocity/runtime/RuntimeInstance.java
+index 670c083d..f877114d 100644
+--- a/src/java/org/apache/velocity/runtime/RuntimeInstance.java
+++ b/src/java/org/apache/velocity/runtime/RuntimeInstance.java
+@@ -32,7 +32,7 @@ import java.util.Map;
+ import java.util.Properties;
+ 
+ import org.apache.commons.collections.ExtendedProperties;
+-import org.apache.commons.lang.text.StrBuilder;
+import org.apache.commons.lang3.text.StrBuilder;
+ import org.apache.velocity.Template;
+ import org.apache.velocity.app.event.EventCartridge;
+ import org.apache.velocity.app.event.EventHandler;
+diff --git a/src/java/org/apache/velocity/runtime/VelocimacroFactory.java b/src/java/org/apache/velocity/runtime/VelocimacroFactory.java
+index 8756b66f..70e3d489 100644
+--- a/src/java/org/apache/velocity/runtime/VelocimacroFactory.java
+++ b/src/java/org/apache/velocity/runtime/VelocimacroFactory.java
+@@ -26,7 +26,7 @@ import java.util.Map;
+ import java.util.Vector;
+ import java.util.ArrayList;
+ 
+-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
+ import org.apache.velocity.Template;
+ import org.apache.velocity.exception.VelocityException;
+ import org.apache.velocity.runtime.directive.Directive;
+diff --git a/src/java/org/apache/velocity/runtime/directive/Block.java b/src/java/org/apache/velocity/runtime/directive/Block.java
+index f5fdfa85..b136543d 100755
+--- a/src/java/org/apache/velocity/runtime/directive/Block.java
+++ b/src/java/org/apache/velocity/runtime/directive/Block.java
+@@ -23,7 +23,7 @@ import java.io.IOException;
+ import java.io.StringWriter;
+ import java.io.Writer;
+ 
+-import org.apache.commons.lang.text.StrBuilder;
+import org.apache.commons.lang3.text.StrBuilder;
+ import org.apache.velocity.context.InternalContextAdapter;
+ import org.apache.velocity.exception.TemplateInitException;
+ import org.apache.velocity.runtime.Renderable;
+diff --git a/src/java/org/apache/velocity/runtime/directive/RuntimeMacro.java b/src/java/org/apache/velocity/runtime/directive/RuntimeMacro.java
+index 090b5522..d22ac4ed 100644
+--- a/src/java/org/apache/velocity/runtime/directive/RuntimeMacro.java
+++ b/src/java/org/apache/velocity/runtime/directive/RuntimeMacro.java
+@@ -23,7 +23,7 @@ import java.io.IOException;
+ import java.io.Writer;
+ import java.util.List;
+ 
+-import org.apache.commons.lang.text.StrBuilder;
+import org.apache.commons.lang3.text.StrBuilder;
+ import org.apache.velocity.context.InternalContextAdapter;
+ import org.apache.velocity.exception.MethodInvocationException;
+ import org.apache.velocity.exception.ParseErrorException;
+diff --git a/src/java/org/apache/velocity/runtime/parser/Parser.java b/src/java/org/apache/velocity/runtime/parser/Parser.java
+index 1253381f..b8e7112e 100644
+--- a/src/java/org/apache/velocity/runtime/parser/Parser.java
+++ b/src/java/org/apache/velocity/runtime/parser/Parser.java
+@@ -10,7 +10,7 @@ import org.apache.velocity.runtime.directive.Directive;
+ import org.apache.velocity.runtime.directive.Macro;
+ import org.apache.velocity.runtime.directive.MacroParseException;
+ import org.apache.velocity.util.StringUtils;
+-import org.apache.commons.lang.text.StrBuilder;
+import org.apache.commons.lang3.text.StrBuilder;
+ import org.apache.velocity.runtime.RuntimeConstants;
+ 
+ /**
+diff --git a/src/java/org/apache/velocity/runtime/parser/ParserTokenManager.java b/src/java/org/apache/velocity/runtime/parser/ParserTokenManager.java
+index ce00d99d..9563a1fb 100644
+--- a/src/java/org/apache/velocity/runtime/parser/ParserTokenManager.java
+++ b/src/java/org/apache/velocity/runtime/parser/ParserTokenManager.java
+@@ -9,7 +9,7 @@ import org.apache.velocity.runtime.directive.Directive;
+ import org.apache.velocity.runtime.directive.Macro;
+ import org.apache.velocity.runtime.directive.MacroParseException;
+ import org.apache.velocity.util.StringUtils;
+-import org.apache.commons.lang.text.StrBuilder;
+import org.apache.commons.lang3.text.StrBuilder;
+ import org.apache.velocity.runtime.RuntimeConstants;
+ 
+ /** Token Manager. */
+diff --git a/src/java/org/apache/velocity/runtime/parser/node/ASTDirective.java b/src/java/org/apache/velocity/runtime/parser/node/ASTDirective.java
+index 74727729..8fc59737 100644
+--- a/src/java/org/apache/velocity/runtime/parser/node/ASTDirective.java
+++ b/src/java/org/apache/velocity/runtime/parser/node/ASTDirective.java
+@@ -22,7 +22,7 @@ package org.apache.velocity.runtime.parser.node;
+ import java.io.IOException;
+ import java.io.Writer;
+ 
+-import org.apache.commons.lang.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+ import org.apache.velocity.context.InternalContextAdapter;
+ import org.apache.velocity.exception.MethodInvocationException;
+ import org.apache.velocity.exception.ParseErrorException;
+diff --git a/src/java/org/apache/velocity/runtime/parser/node/ASTMethod.java b/src/java/org/apache/velocity/runtime/parser/node/ASTMethod.java
+index 489429bb..df54dd93 100644
+--- a/src/java/org/apache/velocity/runtime/parser/node/ASTMethod.java
+++ b/src/java/org/apache/velocity/runtime/parser/node/ASTMethod.java
+@@ -21,8 +21,8 @@ package org.apache.velocity.runtime.parser.node;
+ 
+ import java.lang.reflect.InvocationTargetException;
+ 
+-import org.apache.commons.lang.ArrayUtils;
+-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.ArrayUtils;
+import org.apache.commons.lang3.StringUtils;
+ import org.apache.velocity.app.event.EventHandlerUtil;
+ import org.apache.velocity.context.InternalContextAdapter;
+ import org.apache.velocity.exception.MethodInvocationException;
+diff --git a/src/java/org/apache/velocity/runtime/parser/node/ASTStringLiteral.java b/src/java/org/apache/velocity/runtime/parser/node/ASTStringLiteral.java
+index 2267993c..82cca27a 100644
+--- a/src/java/org/apache/velocity/runtime/parser/node/ASTStringLiteral.java
+++ b/src/java/org/apache/velocity/runtime/parser/node/ASTStringLiteral.java
+@@ -21,7 +21,7 @@ import java.io.IOException;
+ import java.io.StringReader;
+ import java.io.StringWriter;
+ 
+-import org.apache.commons.lang.text.StrBuilder;
+import org.apache.commons.lang3.text.StrBuilder;
+ import org.apache.velocity.context.InternalContextAdapter;
+ import org.apache.velocity.exception.TemplateInitException;
+ import org.apache.velocity.exception.VelocityException;
+diff --git a/src/java/org/apache/velocity/runtime/parser/node/NodeUtils.java b/src/java/org/apache/velocity/runtime/parser/node/NodeUtils.java
+index 713a86ae..0ac03fbc 100644
+--- a/src/java/org/apache/velocity/runtime/parser/node/NodeUtils.java
+++ b/src/java/org/apache/velocity/runtime/parser/node/NodeUtils.java
+@@ -19,7 +19,7 @@ package org.apache.velocity.runtime.parser.node;
+  * under the License.    
+  */
+ 
+-import org.apache.commons.lang.text.StrBuilder;
+import org.apache.commons.lang3.text.StrBuilder;
+ import org.apache.velocity.context.Context;
+ import org.apache.velocity.exception.MethodInvocationException;
+ import org.apache.velocity.runtime.parser.ParserConstants;
+diff --git a/src/java/org/apache/velocity/runtime/parser/node/PropertyExecutor.java b/src/java/org/apache/velocity/runtime/parser/node/PropertyExecutor.java
+index 8c78228e..20d6c185 100644
+--- a/src/java/org/apache/velocity/runtime/parser/node/PropertyExecutor.java
+++ b/src/java/org/apache/velocity/runtime/parser/node/PropertyExecutor.java
+@@ -21,7 +21,7 @@ package org.apache.velocity.runtime.parser.node;
+ 
+ import java.lang.reflect.InvocationTargetException;
+ 
+-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
+ import org.apache.velocity.exception.VelocityException;
+ import org.apache.velocity.runtime.RuntimeLogger;
+ import org.apache.velocity.runtime.log.Log;
+diff --git a/src/java/org/apache/velocity/runtime/parser/node/SetPropertyExecutor.java b/src/java/org/apache/velocity/runtime/parser/node/SetPropertyExecutor.java
+index 0078d023..80887fad 100644
+--- a/src/java/org/apache/velocity/runtime/parser/node/SetPropertyExecutor.java
+++ b/src/java/org/apache/velocity/runtime/parser/node/SetPropertyExecutor.java
+@@ -21,8 +21,8 @@ package org.apache.velocity.runtime.parser.node;
+ 
+ import java.lang.reflect.InvocationTargetException;
+ 
+-import org.apache.commons.lang.StringUtils;
+-import org.apache.commons.lang.text.StrBuilder;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.text.StrBuilder;
+ import org.apache.velocity.exception.VelocityException;
+ import org.apache.velocity.runtime.log.Log;
+ import org.apache.velocity.util.introspection.Introspector;
+diff --git a/src/java/org/apache/velocity/runtime/parser/node/SimpleNode.java b/src/java/org/apache/velocity/runtime/parser/node/SimpleNode.java
+index 108846f8..6372830f 100644
+--- a/src/java/org/apache/velocity/runtime/parser/node/SimpleNode.java
+++ b/src/java/org/apache/velocity/runtime/parser/node/SimpleNode.java
+@@ -22,8 +22,8 @@ package org.apache.velocity.runtime.parser.node;
+ import java.io.IOException;
+ import java.io.Writer;
+ 
+-import org.apache.commons.lang.builder.ToStringBuilder;
+-import org.apache.commons.lang.text.StrBuilder;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.text.StrBuilder;
+ import org.apache.velocity.context.InternalContextAdapter;
+ import org.apache.velocity.exception.MethodInvocationException;
+ import org.apache.velocity.exception.ParseErrorException;
+diff --git a/src/java/org/apache/velocity/runtime/resource/ResourceManagerImpl.java b/src/java/org/apache/velocity/runtime/resource/ResourceManagerImpl.java
+index 778b42a9..a396e42f 100644
+--- a/src/java/org/apache/velocity/runtime/resource/ResourceManagerImpl.java
+++ b/src/java/org/apache/velocity/runtime/resource/ResourceManagerImpl.java
+@@ -158,7 +158,7 @@ public class ResourceManagerImpl
+ 
+         Object cacheObject = null;
+ 
+-        if (org.apache.commons.lang.StringUtils.isNotEmpty(cacheClassName))
+        if (org.apache.commons.lang3.StringUtils.isNotEmpty(cacheClassName))
+         {
+             try
+             {
+@@ -534,7 +534,7 @@ public class ResourceManagerImpl
+              *  this strikes me as bad...
+              */
+ 
+-            if (!org.apache.commons.lang.StringUtils.equals(resource.getEncoding(), encoding))
+            if (!org.apache.commons.lang3.StringUtils.equals(resource.getEncoding(), encoding))
+             {
+                 log.warn("Declared encoding for template '" +
+                              resource.getName() +
+diff --git a/src/java/org/apache/velocity/runtime/resource/loader/ClasspathResourceLoader.java b/src/java/org/apache/velocity/runtime/resource/loader/ClasspathResourceLoader.java
+index 52d09a98..bf48aa45 100644
+--- a/src/java/org/apache/velocity/runtime/resource/loader/ClasspathResourceLoader.java
+++ b/src/java/org/apache/velocity/runtime/resource/loader/ClasspathResourceLoader.java
+@@ -22,7 +22,7 @@ package org.apache.velocity.runtime.resource.loader;
+ import java.io.InputStream;
+ 
+ import org.apache.commons.collections.ExtendedProperties;
+-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
+ import org.apache.velocity.exception.ResourceNotFoundException;
+ import org.apache.velocity.runtime.resource.Resource;
+ import org.apache.velocity.util.ClassUtils;
+diff --git a/src/java/org/apache/velocity/runtime/resource/loader/DataSourceResourceLoader.java b/src/java/org/apache/velocity/runtime/resource/loader/DataSourceResourceLoader.java
+index f85b6d62..38ec30dc 100644
+--- a/src/java/org/apache/velocity/runtime/resource/loader/DataSourceResourceLoader.java
+++ b/src/java/org/apache/velocity/runtime/resource/loader/DataSourceResourceLoader.java
+@@ -218,7 +218,7 @@ public class DataSourceResourceLoader extends ResourceLoader
+     public synchronized InputStream getResourceStream(final String name)
+         throws ResourceNotFoundException
+     {
+-        if (org.apache.commons.lang.StringUtils.isEmpty(name))
+        if (org.apache.commons.lang3.StringUtils.isEmpty(name))
+         {
+             throw new ResourceNotFoundException("DataSourceResourceLoader: Template name was empty or null");
+         }
+diff --git a/src/java/org/apache/velocity/runtime/resource/loader/FileResourceLoader.java b/src/java/org/apache/velocity/runtime/resource/loader/FileResourceLoader.java
+index 923274a7..8580caeb 100644
+--- a/src/java/org/apache/velocity/runtime/resource/loader/FileResourceLoader.java
+++ b/src/java/org/apache/velocity/runtime/resource/loader/FileResourceLoader.java
+@@ -118,7 +118,7 @@ public class FileResourceLoader extends ResourceLoader
+         /*
+          * Make sure we have a valid templateName.
+          */
+-        if (org.apache.commons.lang.StringUtils.isEmpty(templateName))
+        if (org.apache.commons.lang3.StringUtils.isEmpty(templateName))
+         {
+             /*
+              * If we don't get a properly formed templateName then
+diff --git a/src/java/org/apache/velocity/runtime/resource/loader/JarResourceLoader.java b/src/java/org/apache/velocity/runtime/resource/loader/JarResourceLoader.java
+index 054d890e..71d6c083 100644
+--- a/src/java/org/apache/velocity/runtime/resource/loader/JarResourceLoader.java
+++ b/src/java/org/apache/velocity/runtime/resource/loader/JarResourceLoader.java
+@@ -195,7 +195,7 @@ public class JarResourceLoader extends ResourceLoader
+     {
+         InputStream results = null;
+ 
+-        if (org.apache.commons.lang.StringUtils.isEmpty(source))
+        if (org.apache.commons.lang3.StringUtils.isEmpty(source))
+         {
+             throw new ResourceNotFoundException("Need to have a resource!");
+         }
+diff --git a/src/java/org/apache/velocity/runtime/resource/loader/StringResourceLoader.java b/src/java/org/apache/velocity/runtime/resource/loader/StringResourceLoader.java
+index 245c10b8..86a08b9d 100644
+--- a/src/java/org/apache/velocity/runtime/resource/loader/StringResourceLoader.java
+++ b/src/java/org/apache/velocity/runtime/resource/loader/StringResourceLoader.java
+@@ -26,7 +26,7 @@ import java.io.ByteArrayInputStream;
+ import java.io.InputStream;
+ import java.io.UnsupportedEncodingException;
+ import org.apache.commons.collections.ExtendedProperties;
+-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
+ import org.apache.velocity.exception.ResourceNotFoundException;
+ import org.apache.velocity.exception.VelocityException;
+ import org.apache.velocity.runtime.resource.Resource;
+diff --git a/src/java/org/apache/velocity/runtime/resource/loader/URLResourceLoader.java b/src/java/org/apache/velocity/runtime/resource/loader/URLResourceLoader.java
+index de066367..74ab86a6 100644
+--- a/src/java/org/apache/velocity/runtime/resource/loader/URLResourceLoader.java
+++ b/src/java/org/apache/velocity/runtime/resource/loader/URLResourceLoader.java
+@@ -26,7 +26,7 @@ import java.net.URL;
+ import java.net.URLConnection;
+ import java.util.HashMap;
+ import org.apache.commons.collections.ExtendedProperties;
+-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
+ import org.apache.velocity.exception.VelocityException;
+ import org.apache.velocity.exception.ResourceNotFoundException;
+ import org.apache.velocity.runtime.resource.Resource;
+diff --git a/src/java/org/apache/velocity/util/introspection/ClassMap.java b/src/java/org/apache/velocity/util/introspection/ClassMap.java
+index 00512892..2e128b7e 100644
+--- a/src/java/org/apache/velocity/util/introspection/ClassMap.java
+++ b/src/java/org/apache/velocity/util/introspection/ClassMap.java
+@@ -23,7 +23,7 @@ import java.lang.reflect.Method;
+ import java.lang.reflect.Modifier;
+ import java.util.HashMap;
+ import java.util.Map;
+-import org.apache.commons.lang.text.StrBuilder;
+import org.apache.commons.lang3.text.StrBuilder;
+ import org.apache.velocity.runtime.log.Log;
+ import org.apache.velocity.util.MapFactory;
+ 
+diff --git a/src/test/org/apache/velocity/io/UnicodeInputStreamTestCase.java b/src/test/org/apache/velocity/io/UnicodeInputStreamTestCase.java
+index 02499985..4b0b254f 100644
+--- a/src/test/org/apache/velocity/io/UnicodeInputStreamTestCase.java
+++ b/src/test/org/apache/velocity/io/UnicodeInputStreamTestCase.java
+@@ -27,7 +27,7 @@ import junit.framework.Test;
+ import junit.framework.TestCase;
+ import junit.framework.TestSuite;
+ 
+-import org.apache.commons.lang.ArrayUtils;
+import org.apache.commons.lang3.ArrayUtils;
+ 
+ 
+ /**
+diff --git a/src/test/org/apache/velocity/test/BaseTestCase.java b/src/test/org/apache/velocity/test/BaseTestCase.java
+index 0ea00cbd..798a322b 100644
+--- a/src/test/org/apache/velocity/test/BaseTestCase.java
+++ b/src/test/org/apache/velocity/test/BaseTestCase.java
+@@ -353,7 +353,7 @@ public abstract class BaseTestCase extends TestCase implements TemplateTestBase
+                 buf.append(baseFile.getPath());
+             }
+ 
+-            if (org.apache.commons.lang.StringUtils.isNotEmpty(ext))
+            if (org.apache.commons.lang3.StringUtils.isNotEmpty(ext))
+             {
+                 buf.append('.').append(ext);
+             }
+diff --git a/src/test/org/apache/velocity/test/MethodCacheKeyTestCase.java b/src/test/org/apache/velocity/test/MethodCacheKeyTestCase.java
+index 77dfc54e..4befc6ef 100644
+--- a/src/test/org/apache/velocity/test/MethodCacheKeyTestCase.java
+++ b/src/test/org/apache/velocity/test/MethodCacheKeyTestCase.java
+@@ -21,7 +21,7 @@ package org.apache.velocity.test;
+ 
+ import junit.framework.TestCase;
+ 
+-import org.apache.commons.lang.ArrayUtils;
+import org.apache.commons.lang3.ArrayUtils;
+ import org.apache.velocity.runtime.parser.node.ASTMethod;
+ 
+ /**
+-- 
+2.25.4
+
--- a/SOURCES/0002-Force-use-of-JDK-log-chute.patch
+++ b/SOURCES/0002-Force-use-of-JDK-log-chute.patch
@ -0,0 +1,25 @@
+From b2eee6ccc6ef24e084567a0a38d21fa3765df6ad Mon Sep 17 00:00:00 2001
+From: Mikolaj Izdebski <mizdebsk@redhat.com>
+Date: Fri, 15 May 2020 09:56:26 +0200
+Subject: [PATCH 2/2] Force use of JDK log chute
+
+---
+ .../org/apache/velocity/runtime/defaults/velocity.properties    | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/java/org/apache/velocity/runtime/defaults/velocity.properties b/src/java/org/apache/velocity/runtime/defaults/velocity.properties
+index 750a59af..855118b9 100644
+--- a/src/java/org/apache/velocity/runtime/defaults/velocity.properties
+++ b/src/java/org/apache/velocity/runtime/defaults/velocity.properties
+@@ -23,7 +23,7 @@
+ #  default LogChute to use: default: AvalonLogChute, Log4JLogChute, CommonsLogLogChute, ServletLogChute, JdkLogChute
+ # ----------------------------------------------------------------------------
+ 
+-runtime.log.logsystem.class = org.apache.velocity.runtime.log.AvalonLogChute,org.apache.velocity.runtime.log.Log4JLogChute,org.apache.velocity.runtime.log.CommonsLogLogChute,org.apache.velocity.runtime.log.ServletLogChute,org.apache.velocity.runtime.log.JdkLogChute
+runtime.log.logsystem.class = org.apache.velocity.runtime.log.JdkLogChute
+ 
+ # ---------------------------------------------------------------------------
+ # This is the location of the Velocity Runtime log.
+-- 
+2.25.4
+
--- a/SOURCES/0003-CVE-2020-13936.patch
+++ b/SOURCES/0003-CVE-2020-13936.patch
@ -0,0 +1,77 @@
+From 3be84770e7fbe6f000f0c002905e86fe1412d551 Mon Sep 17 00:00:00 2001
+From: Marian Koncek <mkoncek@redhat.com>
+Date: Thu, 11 Mar 2021 16:22:50 +0100
+Subject: [PATCH] CVE-2020-13936
+
+From upstream patches:
+https://github.com/apache/velocity-engine/commit/1ba60771d23dae7e6b3138ae6bee09cf6f9d2485
+https://github.com/apache/velocity-engine/commit/15909056fe51f5d39d49e101d706d3075876dde4
+https://github.com/apache/velocity-engine/commit/3f5d477bb4f4397bed2d2926c35dcef7de3aae3e
+
+---
+ .../velocity/runtime/defaults/velocity.properties | 15 ++++++++++-----
+ .../introspection/SecureIntrospectorImpl.java     |  9 +++++++++
+ 2 files changed, 19 insertions(+), 5 deletions(-)
+
+diff --git a/src/java/org/apache/velocity/runtime/defaults/velocity.properties b/src/java/org/apache/velocity/runtime/defaults/velocity.properties
+index 855118b..a8a9231 100644
+--- a/src/java/org/apache/velocity/runtime/defaults/velocity.properties
+++ b/src/java/org/apache/velocity/runtime/defaults/velocity.properties
+@@ -245,15 +245,16 @@ runtime.introspector.uberspect = org.apache.velocity.util.introspection.Uberspec
+ # accessed.
+ # ----------------------------------------------------------------------------
+ 
+# Prohibit reflection
+ introspector.restrict.packages = java.lang.reflect
+ 
+ # The two most dangerous classes
+# ClassLoader, Thread, and subclasses disabled by default in SecureIntrospectorImpl
+ 
+-introspector.restrict.classes = java.lang.Class
+-introspector.restrict.classes = java.lang.ClassLoader
+-                
+-# Restrict these for extra safety
+# Restrict these system classes.  Note that anything in this list is matched exactly.
+# (Subclasses must be explicitly named to be included).
+ 
+introspector.restrict.classes = java.lang.Class
+ introspector.restrict.classes = java.lang.Compiler
+ introspector.restrict.classes = java.lang.InheritableThreadLocal
+ introspector.restrict.classes = java.lang.Package
+@@ -262,8 +263,12 @@ introspector.restrict.classes = java.lang.Runtime
+ introspector.restrict.classes = java.lang.RuntimePermission
+ introspector.restrict.classes = java.lang.SecurityManager
+ introspector.restrict.classes = java.lang.System
+-introspector.restrict.classes = java.lang.Thread
+ introspector.restrict.classes = java.lang.ThreadGroup
+ introspector.restrict.classes = java.lang.ThreadLocal
+ 
+# Restrict instance managers for common servlet containers  (Tomcat, JBoss, Jetty)
+ 
+introspector.restrict.classes = org.apache.catalina.core.DefaultInstanceManager
+introspector.restrict.classes = org.apache.tomcat.SimpleInstanceManager
+introspector.restrict.classes = org.wildfly.extension.undertow.deployment.UndertowJSPInstanceManager
+introspector.restrict.classes = org.eclipse.jetty.util.DecoratedObjectFactory
+diff --git a/src/java/org/apache/velocity/util/introspection/SecureIntrospectorImpl.java b/src/java/org/apache/velocity/util/introspection/SecureIntrospectorImpl.java
+index f317b1c..25fc84d 100644
+--- a/src/java/org/apache/velocity/util/introspection/SecureIntrospectorImpl.java
+++ b/src/java/org/apache/velocity/util/introspection/SecureIntrospectorImpl.java
+@@ -121,6 +121,15 @@ public class SecureIntrospectorImpl extends Introspector implements SecureIntros
+             return true;
+         }
+ 
+       /**
+       * Always disallow ClassLoader, Thread and subclasses
+       */
+        if (ClassLoader.class.isAssignableFrom(clazz) ||
+                Thread.class.isAssignableFrom(clazz))
+        {
+            return false;
+        }
+
+         /**
+          * check the classname (minus any array info)
+          * whether it matches disallowed classes or packages
+-- 
+2.29.2
+
--- a/SOURCES/generate-tarball.sh
+++ b/SOURCES/generate-tarball.sh
@ -0,0 +1,21 @@
+#!/bin/bash
+set -e
+
+name=velocity
+version="$(sed -n 's/Version:\s*//p' *.spec)"
+
+# RETRIEVE
+wget "http://www.apache.org/dist/${name}/engine/${version}/${name}-${version}.tar.gz" -O "${name}-${version}.orig.tar.gz"
+
+rm -rf tarball-tmp
+mkdir tarball-tmp
+pushd tarball-tmp
+tar xf "../${name}-${version}.orig.tar.gz"
+
+# CLEAN TARBALL
+rm -r */*.jar
+rm -r */lib
+
+tar -czf "../${name}-${version}.tar.gz" *
+popd
+rm -r tarball-tmp "${name}-${version}.orig.tar.gz"
--- a/SOURCES/velocity-1.7.pom
+++ b/SOURCES/velocity-1.7.pom
@ -0,0 +1,346 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.    
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.apache</groupId>
+    <artifactId>apache</artifactId>
+    <version>4</version>
+  </parent>
+
+  <groupId>org.apache.velocity</groupId>
+  <artifactId>velocity</artifactId>
+  <version>1.7</version>
+
+  <name>Apache Velocity</name>
+  <url>http://velocity.apache.org/engine/devel/</url>
+  <description>Apache Velocity is a general purpose template engine.</description>
+  <inceptionYear>2000</inceptionYear>
+  <packaging>jar</packaging>
+  
+  <prerequisites>
+      <maven>2.0.9</maven>
+  </prerequisites>
+
+  <build>
+    <defaultGoal>install</defaultGoal>
+    <sourceDirectory>src/java</sourceDirectory>
+    <testSourceDirectory>src/test</testSourceDirectory>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-site-plugin</artifactId>
+        <configuration>
+          <inputEncoding>UTF-8</inputEncoding>
+          <outputEncoding>UTF-8</outputEncoding>
+          <xdocDirectory>${basedir}/xdocs/docs</xdocDirectory>
+        </configuration>
+      </plugin>
+    </plugins>
+    <resources>
+      <resource>
+        <directory>src/java</directory>
+        <excludes>
+          <exclude>**/*.java</exclude>
+        </excludes>
+      </resource>
+    </resources>
+  </build>
+
+  <distributionManagement>
+    <site>
+      <id>velocity.apache.org</id>
+      <url>scpexe://people.apache.org/www/velocity.apache.org/engine/releases/velocity-1.7</url>
+    </site>
+    <repository>
+      <id>apache.releases</id>
+      <name>Apache Release Distribution Repository</name>
+      <url>scp://people.apache.org/www/people.apache.org/repo/m2-ibiblio-rsync-repository</url>
+    </repository>
+    <snapshotRepository>
+      <id>apache.snapshots</id>
+      <name>Apache Development Snapshot Repository</name>
+      <url>scp://people.apache.org/www/people.apache.org/repo/m2-snapshot-repository</url>
+    </snapshotRepository>
+  </distributionManagement>
+
+  <developers>
+    <developer>
+      <name>Will Glass-Husain</name>
+      <id>wglass</id>
+      <email>wglass@forio.com</email>
+      <organization>Forio Business Simulations</organization>
+      <roles>
+        <role>Java Developer</role>
+      </roles>
+    </developer>
+
+   <developer>
+      <name>Geir Magnusson Jr.</name>
+      <id>geirm</id>
+      <email>geirm@optonline.net</email>
+      <organization>Independent (DVSL Maven)</organization>
+      <roles>
+        <role>Java Developer</role>
+      </roles>
+    </developer>
+
+    <developer>
+      <name>Daniel Rall</name>
+      <id>dlr</id>
+      <email>dlr@finemaltcoding.com</email>
+      <organization>CollabNet, Inc.</organization>
+      <roles>
+        <role>Java Developer</role>
+      </roles>
+    </developer>
+
+    <developer>
+      <name>Henning P. Schmiedehausen</name>
+      <id>henning</id>
+      <email>hps@intermeta.de</email>
+      <organization>INTERMETA - Gesellschaft für Mehrwertdienste mbH</organization>
+      <roles>
+        <role>Java Developer</role>
+      </roles>
+      <timezone>2</timezone>
+    </developer>
+
+    <developer>
+      <name>Nathan Bubna</name>
+      <id>nbubna</id>
+      <email>nathan@esha.com</email>
+      <organization>ESHA Research</organization>
+      <roles>
+        <role>Java Developer</role>
+      </roles>
+    </developer>
+
+  </developers>
+
+  <dependencies>
+    <dependency>
+      <groupId>commons-collections</groupId>
+      <artifactId>commons-collections</artifactId>
+      <version>3.2.1</version>
+    </dependency>
+    <dependency>
+      <groupId>commons-lang</groupId>
+      <artifactId>commons-lang</artifactId>
+      <version>2.4</version>
+    </dependency>
+    <dependency>
+      <groupId>oro</groupId>
+      <artifactId>oro</artifactId>
+      <version>2.0.8</version>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>jdom</groupId>
+      <artifactId>jdom</artifactId>
+      <version>1.0</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+      <version>1.1</version>
+      <scope>provided</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>avalon-framework</groupId>
+          <artifactId>avalon-framework</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>log4j</groupId>
+          <artifactId>log4j</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>javax.servlet</groupId>
+          <artifactId>servlet-api</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+      <version>1.2.12</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>servlet-api</artifactId>
+      <version>2.3</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>logkit</groupId>
+      <artifactId>logkit</artifactId>
+      <version>2.0</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>ant</groupId>
+      <artifactId>ant</artifactId>
+      <version>1.6</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>werken-xpath</groupId>
+      <artifactId>werken-xpath</artifactId>
+      <version>0.9.4</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>3.8.1</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>hsqldb</groupId>
+      <artifactId>hsqldb</artifactId>
+      <version>1.7.1</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
+  <reporting>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-project-info-reports-plugin</artifactId>
+        <version>2.1</version>
+        <reportSets>
+          <reportSet>
+            <reports>
+              <report>dependencies</report>
+              <report>issue-tracking</report>
+              <report>license</report>
+              <report>summary</report>
+              <report>scm</report>
+            </reports>
+          </reportSet>
+        </reportSets>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-changes-plugin</artifactId>
+        <version>2.0</version>
+        <reportSets>
+          <reportSet>
+            <reports>
+              <report>changes-report</report>
+              <report>jira-report</report>
+            </reports>
+          </reportSet>
+        </reportSets>
+        <configuration>
+            <issueLinkTemplate>${jira.browse.url}/%ISSUE%</issueLinkTemplate>
+          <!-- Apache JIRA, Component Engine -->
+          <component>12311337</component>
+          <!-- FixFor 1.6 -->
+          <filter>fixfor=12310290&amp;sorter/field=issuekey&amp;sorter/order=ASC</filter>
+          <maxEntries>100</maxEntries>
+          <teamlist>http://velocity.apache.org/who-we-are.html</teamlist>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>taglist-maven-plugin</artifactId>
+        <version>2.2</version>
+        <configuration>
+          <tag>TODO</tag>
+          <tag>FIXME</tag>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jxr-plugin</artifactId>
+        <version>2.1</version>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-javadoc-plugin</artifactId>
+        <version>2.5</version>
+        <configuration>
+          <links>
+            <link>http://java.sun.com/j2se/1.4.2/docs/api</link>
+            <link>http://jakarta.apache.org/oro/api</link>
+            <link>http://jakarta.apache.org/commons/lang/api-release</link>
+            <link>http://jakarta.apache.org/commons/collections/api-release</link>
+
+            <link>http://www.jdom.org/docs/apidocs</link>
+            <link>http://logging.apache.org/log4j/docs/api</link>
+            <link>http://excalibur.apache.org/apidocs</link>
+            <link>http://tomcat.apache.org/tomcat-4.1-doc/servletapi</link>
+          </links>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-changelog-plugin</artifactId>
+        <version>2.1</version>
+      </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>findbugs-maven-plugin</artifactId>
+        <version>1.2</version>
+        <configuration>
+          <xmlOutput>true</xmlOutput>
+          <threshold>Low</threshold>
+          <effort>Max</effort>
+          <excludeFilterFile>build/findbugs-exclude.xml</excludeFilterFile>
+          <findbugsXmlOutputDirectory>xdocs</findbugsXmlOutputDirectory> 
+        </configuration>
+      </plugin>
+      <plugin>      
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <source>1.4</source>
+          <target>1.4</target>
+        </configuration>
+      </plugin>
+    </plugins>
+  </reporting>
+
+  <scm>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/velocity/engine/trunk</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/velocity/engine/trunk</developerConnection>
+    <tag>HEAD</tag>
+    <url>http://svn.apache.org/viewvc/velocity/engine/trunk</url>
+  </scm>
+
+    <properties>
+        <jira.browse.url>https://issues.apache.org/jira/browse</jira.browse.url>
+    </properties>
+
+  <issueManagement>
+    <system>JIRA</system>
+    <url>${jira.browse.url}/VELOCITY</url>
+  </issueManagement>
+</project>
--- a/SPECS/velocity.spec
+++ b/SPECS/velocity.spec
@ -0,0 +1,409 @@
+%bcond_with bootstrap
+
+Name:           velocity
+Version:        1.7
+Release:        38%{?dist}
+Summary:        Java-based template engine
+License:        ASL 2.0
+URL:            http://velocity.apache.org/
+BuildArch:      noarch
+
+# ./generate-tarball.sh
+Source0:        %{name}-%{version}.tar.gz
+Source1:        http://repo1.maven.org/maven2/org/apache/%{name}/%{name}/%{version}/%{name}-%{version}.pom
+# Remove bundled binaries which cannot be easily verified for licensing
+Source2:        generate-tarball.sh
+
+Patch1:         0001-Port-to-apache-commons-lang3.patch
+Patch2:         0002-Force-use-of-JDK-log-chute.patch
+Patch3:         0003-CVE-2020-13936.patch
+
+BuildRequires:  maven-local
+%if %{with bootstrap}
+BuildRequires:  javapackages-bootstrap
+%else
+BuildRequires:  mvn(commons-collections:commons-collections)
+BuildRequires:  mvn(org.apache.commons:commons-lang3)
+BuildRequires:  mvn(org.apache:apache:pom:)
+%endif
+
+%description
+Velocity is a Java-based template engine. It permits anyone to use the
+simple yet powerful template language to reference objects defined in
+Java code.
+When Velocity is used for web development, Web designers can work in
+parallel with Java programmers to develop web sites according to the
+Model-View-Controller (MVC) model, meaning that web page designers can
+focus solely on creating a site that looks good, and programmers can
+focus solely on writing top-notch code. Velocity separates Java code
+from the web pages, making the web site more maintainable over the long
+run and providing a viable alternative to Java Server Pages (JSPs) or
+PHP.
+Velocity's capabilities reach well beyond the realm of web sites; for
+example, it can generate SQL and PostScript and XML (see Anakia for more
+information on XML transformations) from templates. It can be used
+either as a standalone utility for generating source code and reports,
+or as an integrated component of other systems. Velocity also provides
+template services for the Turbine web application framework.
+Velocity+Turbine provides a template service that will allow web
+applications to be developed according to a true MVC model.
+
+%package        javadoc
+Summary:        Javadoc for %{name}
+
+%description    javadoc
+Javadoc for %{name}.
+
+%prep
+%setup -q
+cp %{SOURCE1} ./pom.xml
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+
+find . -name '*.jar' ! -name 'test*.jar' -print -delete
+find . -name '*.class' ! -name 'Foo.class' -print -delete
+
+# Disable unneeded features
+rm -r src/java/org/apache/velocity/{anakia,texen,servlet,convert}
+rm src/java/org/apache/velocity/runtime/log/{Avalon,Log4J}Log{Chute,System}.java
+rm src/java/org/apache/velocity/runtime/log/{CommonsLog,Servlet}LogChute.java
+rm src/java/org/apache/velocity/runtime/log/SimpleLog4JLogSystem.java
+rm src/java/org/apache/velocity/runtime/log/VelocityFormatter.java
+rm src/java/org/apache/velocity/app/event/implement/Escape{Html,JavaScript,Sql,Xml,}Reference.java
+
+%pom_remove_dep :oro
+%pom_remove_dep :jdom
+%pom_remove_dep :commons-logging
+%pom_remove_dep :log4j
+%pom_remove_dep :servlet-api
+%pom_remove_dep :logkit
+%pom_remove_dep :ant
+%pom_remove_dep :werken-xpath
+
+%mvn_alias : %{name}:%{name}
+
+%build
+%mvn_build -f
+
+%install
+%mvn_install
+
+%files -f .mfiles
+%doc README.txt
+%license LICENSE NOTICE
+
+%files javadoc -f .mfiles-javadoc
+%license LICENSE NOTICE
+
+%changelog
+* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 1.7-38
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+  Related: rhbz#1991688
+
+* Wed Jun 09 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.7-37
+- Rebuild to workaround DistroBaker issue
+
+* Tue Jun 08 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.7-36
+- Bootstrap Maven for CentOS Stream 9
+
+* Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.7-35
+- Bootstrap build
+- Non-bootstrap build
+
+* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.7-34
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Fri Sep 11 2020 Fabio Valentini <decathorpe@gmail.com> - 0:1.7-33
+- Default to JDK logging and drop commons-logging and log4j12 implementations.
+
+* Thu Jul 30 2020 Fabio Valentini <decathorpe@gmail.com> - 0:1.7-32
+- Port to commons-lang3.
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.7-31
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Tue Jul 14 2020 Jiri Vanek <jvanek@redhat.com> - 0:1.7-30
+- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
+
+* Mon Jul 13 2020 Mat Booth <mat.booth@redhat.com> - 0:1.7-29
+- Ignore test case that fails on Java 11
+
+* Sat Jul 11 2020 Jiri Vanek <jvanek@redhat.com> - 0:1.7-28
+- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
+
+* Fri May 15 2020 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.7-27
+- Build with Maven
+
+* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.7-27
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.7-26
+- Mass rebuild for javapackages-tools 201902
+
+* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.7-26
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.7-25
+- Mass rebuild for javapackages-tools 201901
+
+* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.7-25
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Tue Jul 31 2018 Michael Simacek <msimacek@redhat.com> - 0:1.7-24
+- Repack the tarball without binaries
+
+* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.7-23
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.7-22
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.7-21
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Tue Feb 07 2017 Michael Simacek <msimacek@redhat.com> - 0:1.7-20
+- Add hsqldb conditional
+- Switch to glassfish-servlet-api
+
+* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.7-19
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Wed Jul 22 2015 gil cattaneo <puntogil@libero.it> 0:1.7-18
+- fix FTBFS rhbz#1240035
+- fix BR list, change log4j with log4j12
+- set javac source/target to 1.6
+- disable Java8doc doclint
+- remove werken-xpath Import/Export refences in manifest file
+- resolve some rpmlint problems
+- remove zero-length file
+- introduce license macro
+
+* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.7-17
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Fri Nov 28 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:1.7-16
+- Update to current packaging guidelines
+
+* Thu Sep  4 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:1.7-15
+- Require hsqldb-lib instead of hsqldb
+
+* Wed Jun 18 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:1.7-14
+- Apply patch for log4j 1.2.17
+
+* Wed Jun 18 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:1.7-13
+- Use log4j 1.2 compat package
+- Skip Java 8 incompatible test
+
+* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.7-12
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Wed May 21 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:1.7-11
+- Use .mfiles generated during build
+
+* Sat Sep 21 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:1.7-10
+- Port from werken-xpath to jdom
+- Resolves: rhbz#875817
+
+* Mon Aug 05 2013 Michal Srb <msrb@redhat.com> - 0:1.7-9
+- Fix FTBFS (Resolves: #992852)
+
+* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.7-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
+* Fri Feb 15 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.7-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
+* Wed Nov 21 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:1.7-6
+- Install NOTICE files
+- Resolves: rhbz#879021
+
+* Sun Jul 22 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.7-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Tue Jun 05 2012 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0:1.7-4
+- Use new tomcat-servlet-api
+- Update to latest guidelines
+
+* Fri Feb 17 2012 Deepak Bhole <dbhole@redhat.com> - 0:1.7-3
+- Resolved rhbz#791045
+- Added patch from Omaid Majid <omajid@redhat.com> to fix build with Java 7
+
+* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.7-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Mon Feb 21 2011 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0:1.7-1
+- Update to latest version
+- Drop old patches
+
+* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.6.4-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Fri Dec 17 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0:1.6.4-2
+- Add compatibility depmap
+
+* Wed Nov  3 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0:1.6.4-1
+- Rebase to latest upstream
+- Fix problems from bz#226525
+
+* Thu Oct 14 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0:1.6.3-5
+- Use apache-commons-collections instead of jakarta name
+- Use tomcat6 for dependency instead of tomcat5 (bz#640660)
+
+* Mon Jun 7 2010 Alexander Kurtakov <akurtako@redhat.com> 0:1.6.3-4
+- Fix BR/R for jakarta-commons-rename.
+
+* Sat Feb 13 2010 Mary Ellen Foster <mefoster at gmail.com> 0:1.6.3-3
+- Get (Build)Requires right
+
+* Sat Feb 13 2010 Mary Ellen Foster <mefoster at gmail.com> 0:1.6.3-2
+- Require all of the packages in the POM
+- Add dist to version
+
+* Fri Jan 15 2010 Mary Ellen Foster <mefoster at gmail.com> 0:1.6.3-1
+- Update to 1.6.3
+- Remove dependency on avalon-logkit
+- Add maven metadata and pom
+
+* Sun Jan 10 2010 Alexander Kurtakov <akurtako@redhat.com> 0:1.4-10.5
+- Drop gcj_support.
+- Fix groups and url.
+- Use upstream tarball.
+
+* Mon Aug 10 2009 Ville Skyttä <ville.skytta@iki.fi> - 0:1.4-10.4
+- Convert specfile to UTF-8.
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.4-9.4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Fri Apr 24 2009 Milos Jakubicek <xjakub@fi.muni.cz> - 0:1.4-8.4
+- Fix FTBFS: added velocity-enum.patch (enum is a reserved keyword in java >= 1.5)
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.4-8.3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Thu Jul 10 2008 Tom "spot" Callaway <tcallawa@redhat.com> - 0:1.4-7.3
+- drop repotag
+
+* Thu May 29 2008 Tom "spot" Callaway <tcallawa@redhat.com> - 0:1.4-7jpp.2
+- fix license tag
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 0:1.4-7jpp.1
+- Autorebuild for GCC 4.3
+
+* Tue Aug 08 2006 Vivek Lakshmanan <vivekl@redhat.com> - 0:1.4-6jpp.1
+- Resync with latest from JPP.
+- Partially adopt new naming convention.
+
+* Sat Jul 22 2006 Vivek Lakshmanan <vivekl@redhat.com> - 0:1.4-5jpp_2fc
+- Rebuilt
+
+* Sat Jul 22 2006 Vivek Lakshmanan <vivekl@redhat.com> - 0:1.4-5jpp_1fc
+- Merge with latest from JPP.
+- Remove fileversion and my_version macros.
+- Remove notexentests patch and replace with a patch to disable
+- failure on tests.
+
+* Sat Jul 22 2006 Jakub Jelinek <jakub@redhat.com> - 0:1.4-3jpp_8fc
+- Rebuilt
+
+* Tue Jul 18 2006 Deepak Bhole <dbhole@redhat.com> - 0:1.4-3jpp_7fc
+- Build on all archs.
+
+* Wed Jul 12 2006 Jesse Keating <jkeating@redhat.com> - 0:1.4-3jpp_6fc
+- rebuild
+
+* Wed Mar  8 2006 Rafael Schloming <rafaels@redhat.com> - 0:1.4-3jpp_5fc
+- excluded s390[x] and ppc64 due to eclipse
+
+* Mon Mar  6 2006 Jeremy Katz <katzj@redhat.com> - 0:1.4-3jpp_4fc
+- stop scriptlet spew
+
+* Wed Dec 21 2005 Jesse Keating <jkeating@redhat.com> - 0:1.4-3jpp_3fc
+- rebuilt again
+
+* Fri Dec 09 2005 Jesse Keating <jkeating@redhat.com> - 0:1.4-3jpp_2fc
+- rebuilt
+
+* Tue Nov  8 2005 Vadim Nasardinov <vadimn@redhat.com> - 0:1.4-3jpp_1fc
+- Converted from ISO-8859-1 to UTF-8
+
+* Wed Jun 15 2005 Gary Benson <gbenson@redhat.com> 0:1.4-3jpp_1fc
+- Build into Fedora.
+
+* Thu Jun  9 2005 Gary Benson <gbenson@redhat.com>
+- Remove jarfiles from the tarball.
+
+* Mon Jun  6 2005 Gary Benson <gbenson@redhat.com>
+- Build with servletapi5.
+- Add NOTICE file as per Apache License version 2.0.
+- Skip some failing tests.
+
+* Mon Oct 18 2004 Fernando Nasser <fnasser@redhat.com> 0:1.4-3jpp_1rh
+- First Red Hat build
+
+* Thu Sep 23 2004 Ralph Apel <r.apel at r-apel.de> 0:1.4-3jpp
+- Adapt to jdom-1.0-1 replacing org.jdom.input.DefaultJDOMFactory
+  by org.jdom.DefaultJDOMFactory in AnakiaJDOMFactory.java
+  as well as using org.jdom.output.Format in AnakiaTask.java
+- Therefore require jdom >= 0:1.0-1
+
+* Thu Sep 02 2004 Ralph Apel <r.apel at r-apel.de> 0:1.4-2jpp
+- Build with ant-1.6.2
+
+* Mon Jun 07 2004 Kaj J. Niemi <kajtzu@fi.basen.net> 0:1.4-1jpp
+- 1.4 final
+- Patch #0 is unnecessary (upstream)
+- We have to build velocity against servletapi3
+
+* Wed Feb 18 2004 Kaj J. Niemi <kajtzu@fi.basen.net> 0:1.4-0.rc1.2jpp
+- Fix a few jpackage related .spec typos, oops.
+
+* Wed Feb 18 2004 Kaj J. Niemi <kajtzu@fi.basen.net> 0:1.4-0.rc1.1jpp
+- Added Patch #0 (velocity-1.4-rc1-ServletTest.patch) from CVS which fixes
+  build problems.
+
+* Sun May 25 2003 Ville Skyttä <ville.skytta@iki.fi> - 0:1.3.1-2jpp
+- Add Epochs to dependencies.
+- Add explicit defattrs.
+- Add non-versioned javadoc symlinks.
+- Use sed instead of bash 2 extension when symlinking jars during build.
+- Use full URL in Source.
+- Fix -javadoc Group tag.
+- Drop patch in favour of ant options.
+- BuildRequire jpackage-utils and antlr (latter needed for Anakia tests).
+
+* Sat May 24 2003 Richard Bullington-McGuire <rbulling@pkrinternet.com> 1.3.1-1jpp
+- 1.3.1 stable release
+
+* Fri May 23 2003 Richard Bullington-McGuire <rbulling@pkrinternet.com> 1.3-1jpp
+- 1.3 stable release
+- Updated for JPackage 1.5
+- Run JUnit regression tests as part of the build process
+- Added patch file to fix test case classpath for JUnit standard locations
+
+* Mon May 06 2002 Guillaume Rousse <guillomovitch@users.sourceforge.net> 1.3-0.rc1.1jpp
+- 1.3.0rc1
+- dropped patch
+- versioned dir for javadoc
+- no dependencies for manual and javadoc packages
+- stricter dependency for demo package
+
+* Wed Dec 12 2001 Guillaume Rousse <guillomovitch@users.sourceforge.net> 1.2-1jpp
+- 1.2
+- regenerated patch and corrected manifest
+- requires and buildrequires jdom >= 1.0-0.b7.1
+
+* Wed Dec 5 2001 Guillaume Rousse <guillomovitch@users.sourceforge.net> 1.1-4jpp
+- javadoc into javadoc package
+
+* Wed Nov 21 2001 Christian Zoffoli <czoffoli@littlepenguin.org> 1.1-3jpp
+- removed packager tag
+- new jpp extension
+
+* Thu Nov 1 2001 Guillaume Rousse <guillomovitch@users.sourceforge.net> 1.1-2jpp
+- first unified release
+- s/jPackage/JPackage
+
+* Fri Sep 14 2001 Guillaume Rousse <guillomovitch@users.sourceforge.net> 1.1-1jpp
+- first Mandrake release
				`@ -0,0 +1 @@`
				`ac76c23153cd2214591b6783f255ad210467b2f8 SOURCES/velocity-1.7.tar.gz`