9 changed files with 131 additions and 985 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1 +1 @@
-SOURCES/velocity-1.7.tar.gz
+SOURCES/velocity-2.3.tar.gz
--- a/.velocity.metadata
+++ b/.velocity.metadata
@ -1 +1 @@
-ac76c23153cd2214591b6783f255ad210467b2f8 SOURCES/velocity-1.7.tar.gz
+c7f19c2d5dac64f5c617465ddca8eb8b24acdaf5 SOURCES/velocity-2.3.tar.gz
--- a/SOURCES/0001-Port-to-apache-commons-lang3.patch
+++ b/SOURCES/0001-Port-to-apache-commons-lang3.patch
@ -1,464 +0,0 @@
-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/0001-Template-is-a-reserved-keyword-in-javacc.patch
+++ b/SOURCES/0001-Template-is-a-reserved-keyword-in-javacc.patch
@ -0,0 +1,50 @@
+From 4275860ed4a69047f783f0c06004ba4f1256a994 Mon Sep 17 00:00:00 2001
+From: Mikolaj Izdebski <mizdebsk@redhat.com>
+Date: Wed, 23 Aug 2023 08:49:53 +0200
+Subject: [PATCH] Template is a reserved keyword in javacc
+
+Forwarded: no
+---
+ velocity-engine-core/src/main/parser/Parser.jjt | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/velocity-engine-core/src/main/parser/Parser.jjt b/velocity-engine-core/src/main/parser/Parser.jjt
+index 593d044b..f3bed948 100644
+--- a/velocity-engine-core/src/main/parser/Parser.jjt
+++ b/velocity-engine-core/src/main/parser/Parser.jjt
+@@ -234,12 +234,12 @@ public class ${parser.basename}Parser implements Parser
+      * the new stream that we want parsed.
+      */
+     @Override
+-    public SimpleNode parse( Reader reader, Template template )
+    public SimpleNode parse( Reader reader, Template tmplate )
+         throws ParseException
+     {
+         SimpleNode sn = null;
+ 
+-        currentTemplate = template;
+        currentTemplate = tmplate;
+ 
+         try
+         {
+@@ -267,7 +267,7 @@ public class ${parser.basename}Parser implements Parser
+              *  thrown by the Macro class when something is amiss in the
+              *  Macro specification
+              */
+-            log.error("{}: {}", template.getName(), mee.getMessage(), mee);
+            log.error("{}: {}", tmplate.getName(), mee.getMessage(), mee);
+             throw mee;
+         }
+         catch (ParseException pe)
+@@ -282,7 +282,7 @@ public class ${parser.basename}Parser implements Parser
+         }
+         catch (Exception e)
+         {
+-            String msg = template.getName() + ": " + e.getMessage();
+            String msg = tmplate.getName() + ": " + e.getMessage();
+             log.error(msg, e);
+             throw new VelocityException(msg, e, getRuntimeServices().getLogContext().getStackTrace());
+         }
+-- 
+2.41.0
+
--- a/SOURCES/0002-Force-use-of-JDK-log-chute.patch
+++ b/SOURCES/0002-Force-use-of-JDK-log-chute.patch
@ -1,25 +0,0 @@
-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
@ -1,77 +0,0 @@
-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
@ -1,21 +0,0 @@
-#!/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
@ -1,346 +0,0 @@
-<?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
@ -1,30 +1,31 @@
 %bcond_with bootstrap

 Name:           velocity
-Version:        1.7
-Release:        38%{?dist}
+Version:        2.3
+Release:        6%{?dist}
 Summary:        Java-based template engine
-License:        ASL 2.0
+License:        Apache-2.0
 URL:            http://velocity.apache.org/
 BuildArch:      noarch
+ExclusiveArch:  %{java_arches} 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
+Source0:        https://github.com/apache/velocity-engine/archive/refs/tags/%{version}.tar.gz#/%{name}-%{version}.tar.gz

-Patch1:         0001-Port-to-apache-commons-lang3.patch
-Patch2:         0002-Force-use-of-JDK-log-chute.patch
-Patch3:         0003-CVE-2020-13936.patch
+Patch0:         0001-Template-is-a-reserved-keyword-in-javacc.patch

-BuildRequires:  maven-local
 %if %{with bootstrap}
 BuildRequires:  javapackages-bootstrap
 %else
-BuildRequires:  mvn(commons-collections:commons-collections)
+BuildRequires:  maven-local
+BuildRequires:  mvn(commons-io:commons-io)
 BuildRequires:  mvn(org.apache.commons:commons-lang3)
-BuildRequires:  mvn(org.apache:apache:pom:)
+BuildRequires:  mvn(org.apache.felix:maven-bundle-plugin)
+BuildRequires:  mvn(org.apache.maven.plugins:maven-enforcer-plugin)
+BuildRequires:  mvn(org.apache.maven.plugins:maven-source-plugin)
+BuildRequires:  mvn(org.codehaus.mojo:extra-enforcer-rules)
+BuildRequires:  mvn(org.codehaus.mojo:javacc-maven-plugin)
+BuildRequires:  mvn(org.slf4j:slf4j-api)
+BuildRequires:  mvn(junit:junit)
 %endif

 %description
@ -55,57 +56,85 @@ Summary:        Javadoc for %{name}
 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}
+%setup -q -n velocity-engine-%{version}
+%patch0 -p1
+
+%mvn_alias : velocity:velocity
+%mvn_alias : org.apache.velocity:velocity
+
+%pom_remove_parent
+%pom_xpath_inject pom:project "<groupId>org.apache.velocity</groupId>"
+
+%pom_disable_module spring-velocity-support
+%pom_disable_module velocity-custom-parser-example
+%pom_disable_module velocity-engine-examples
+%pom_disable_module velocity-engine-scripting
+
+%pom_remove_plugin :maven-javadoc-plugin
+
+%pom_remove_plugin :templating-maven-plugin velocity-engine-core
+sed 's/${project.version}/%{version}/' \
+    velocity-engine-core/src/main/java-templates/org/apache/velocity/runtime/VelocityEngineVersion.java \
+   >velocity-engine-core/src/main/java/org/apache/velocity/runtime/VelocityEngineVersion.java
+
+%pom_remove_plugin com.google.code.maven-replacer-plugin:replacer velocity-engine-core
+%pom_remove_plugin :maven-shade-plugin velocity-engine-core
+
+%pom_xpath_remove "pom:dependency[pom:scope='test']" velocity-engine-core

 %build
-%mvn_build -f
+%mvn_build -f -- -Djavacc.visitor=false

 %install
 %mvn_install

 %files -f .mfiles
-%doc README.txt
+%doc README.md
 %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
+* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 2.3-6
+- Bump release for October 2024 mass rebuild:
+  Resolves: RHEL-64018
+
+* Fri Oct 25 2024 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 2.3-5
+- Rebuilt for MSVSphere 10
+
+* Thu Aug 01 2024 Troy Dawson <tdawson@redhat.com> - 2.3-5
+- Bump release for Aug 2024 java mass rebuild
+
+* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 2.3-4
+- Bump release for June 2024 mass rebuild
+
+* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.3-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Fri Sep 01 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.3-2
+- Convert License tag to SPDX format
+
+* Fri Aug 25 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.3-1
+- Update to upstream version 2.3
+
+* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.7-41
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.7-40
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.7-39
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 1.7-38
+- Rebuilt for java-17-openjdk as system jdk

-* Wed Jun 09 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.7-37
- Rebuild to workaround DistroBaker issue
+* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.7-37
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild

-* Tue Jun 08 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.7-36
- Bootstrap Maven for CentOS Stream 9
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.7-36
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild

 * Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.7-35
 - Bootstrap build