diff --git a/.fmf/version b/.fmf/version new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/.fmf/version @@ -0,0 +1 @@ +1 diff --git a/.gitignore b/.gitignore index 57d2359..caf7f2c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,6 @@ velocity-1.6.3.tar.gz /velocity-1.6.4.tar.gz /velocity-1.7.tar.gz +/velocity-1.7.pom +/velocity-2.3.tar.gz +/velocity-2.4.1.tar.gz diff --git a/0000-Remove-avalon-logkit.patch b/0000-Remove-avalon-logkit.patch deleted file mode 100644 index 552fca3..0000000 --- a/0000-Remove-avalon-logkit.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 15c0c0edebc8980dfa3d64f507962f7b822d0fdc Mon Sep 17 00:00:00 2001 -From: Stanislav Ochotnicky -Date: Thu, 30 Jul 2020 15:35:08 +0200 -Subject: [PATCH 0/8] Remove avalon-logkit - ---- - pom.xml | 6 ------ - .../apache/velocity/runtime/defaults/velocity.properties | 4 ++-- - src/java/org/apache/velocity/runtime/log/LogManager.java | 2 +- - 3 files changed, 3 insertions(+), 9 deletions(-) - -diff --git a/pom.xml b/pom.xml -index 77a8e38..f453208 100644 ---- a/pom.xml -+++ b/pom.xml -@@ -196,12 +196,6 @@ - 2.3 - provided - -- -- logkit -- logkit -- 2.0 -- provided -- - - ant - ant -diff --git a/src/java/org/apache/velocity/runtime/defaults/velocity.properties b/src/java/org/apache/velocity/runtime/defaults/velocity.properties -index 750a59a..7fac119 100644 ---- a/src/java/org/apache/velocity/runtime/defaults/velocity.properties -+++ b/src/java/org/apache/velocity/runtime/defaults/velocity.properties -@@ -20,10 +20,10 @@ - # ---------------------------------------------------------------------------- - - # ---------------------------------------------------------------------------- --# default LogChute to use: default: AvalonLogChute, Log4JLogChute, CommonsLogLogChute, ServletLogChute, JdkLogChute -+# default LogChute to use: default: 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.26.2 - diff --git a/0001-Template-is-a-reserved-keyword-in-javacc.patch b/0001-Template-is-a-reserved-keyword-in-javacc.patch new file mode 100644 index 0000000..bc56508 --- /dev/null +++ b/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 +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 4e790735..50c0ebac 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 t ) ++ public SimpleNode parse( Reader reader, Template tmplate ) + throws ParseException + { + SimpleNode sn = null; + +- currentTemplate = t; ++ 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("{}: {}", t.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 = t.getName() + ": " + e.getMessage(); ++ String msg = tmplate.getName() + ": " + e.getMessage(); + log.error(msg, e); + throw new VelocityException(msg, e, getRuntimeServices().getLogContext().getStackTrace()); + } +-- +2.52.0 + diff --git a/0002-Use-system-jars.patch b/0002-Use-system-jars.patch deleted file mode 100644 index 8de07d4..0000000 --- a/0002-Use-system-jars.patch +++ /dev/null @@ -1,197 +0,0 @@ -From d7c3b400786c04eacc0065acccdad6b40ccbc35b Mon Sep 17 00:00:00 2001 -From: Stanislav Ochotnicky -Date: Thu, 30 Jul 2020 15:36:52 +0200 -Subject: [PATCH 2/8] Use system jars - ---- - build/build.xml | 56 ++++++++++----------------------------------- - build/testcases.xml | 6 ----- - 2 files changed, 12 insertions(+), 50 deletions(-) - -diff --git a/build/build.xml b/build/build.xml -index c667553..479ef2d 100644 ---- a/build/build.xml -+++ b/build/build.xml -@@ -140,28 +140,6 @@ - - - -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- - - - -@@ -174,12 +152,11 @@ - - - -- -+ - - - -- - - - -@@ -210,10 +187,9 @@ - - - -- -+ - -- - - - -@@ -248,7 +224,7 @@ - - - -- - -+ optimize="${optimize}"/> - - - -@@ -268,7 +243,7 @@ - - - -- - - -- -- - - - -@@ -561,7 +534,7 @@ - - - -- - - -@@ -585,8 +558,7 @@ - encoding="UTF-8" - debug="${debug}" - deprecation="${deprecation}" -- optimize="${optimize}" -- classpathref="velocity.run.classpath"/> -+ optimize="${optimize}"/> - - - -@@ -604,7 +576,7 @@ - - - -- - - -@@ -620,8 +592,7 @@ - doctitle="${name} ${version} API" - encoding="UTF-8" - docencoding="UTF-8" -- bottom="Copyright © 2000-${build.year} <a href="http://www.apache.org/">Apache Software Foundation</a>. All Rights Reserved." -- classpathref="velocity.build.classpath"> -+ bottom="Copyright © 2000-${build.year} <a href="http://www.apache.org/">Apache Software Foundation</a>. All Rights Reserved."> - - - -@@ -1024,12 +995,11 @@ - - - -- - - -+ classname="org.apache.velocity.anakia.AnakiaTask"/> - - - ####################################################### -@@ -1231,7 +1201,7 @@ - - - -- - - -@@ -1264,8 +1234,6 @@ - - - -- -- - - - -diff --git a/build/testcases.xml b/build/testcases.xml -index 06bb36e..f3749bc 100644 ---- a/build/testcases.xml -+++ b/build/testcases.xml -@@ -36,12 +36,6 @@ - - - -- -- -- -- -- -- - - - --- -2.26.2 - diff --git a/0003-JDBC-41-compat.patch b/0003-JDBC-41-compat.patch deleted file mode 100644 index 5bc75eb..0000000 --- a/0003-JDBC-41-compat.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 716435f7bda16e053e7d3166b6ef3d93a047d2c2 Mon Sep 17 00:00:00 2001 -From: Fabio Valentini -Date: Thu, 30 Jul 2020 15:37:21 +0200 -Subject: [PATCH 3/8] JDBC 41 compat - ---- - src/test/org/apache/velocity/test/sql/HsqlDataSource.java | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/test/org/apache/velocity/test/sql/HsqlDataSource.java b/src/test/org/apache/velocity/test/sql/HsqlDataSource.java -index 547928b..360a6d4 100644 ---- a/src/test/org/apache/velocity/test/sql/HsqlDataSource.java -+++ b/src/test/org/apache/velocity/test/sql/HsqlDataSource.java -@@ -23,6 +23,7 @@ import java.io.PrintWriter; - import java.sql.Connection; - import java.sql.DriverManager; - import java.sql.SQLException; -+import java.sql.SQLFeatureNotSupportedException; - - import javax.sql.DataSource; - -@@ -73,5 +74,8 @@ public class HsqlDataSource implements DataSource { - public Object unwrap(final Class iface) throws SQLException { - throw new SQLException("Not implemented"); - } -+ public java.util.logging.Logger getParentLogger() throws SQLFeatureNotSupportedException { -+ throw new SQLFeatureNotSupportedException("getParentLogger() not supported"); -+ } - - } --- -2.26.2 - diff --git a/0004-Do-not-use-Werken-XPath.patch b/0004-Do-not-use-Werken-XPath.patch deleted file mode 100644 index c6a25cd..0000000 --- a/0004-Do-not-use-Werken-XPath.patch +++ /dev/null @@ -1,165 +0,0 @@ -From 55c4e510ccd1483ec7e1a15fff366753b6ada3ac Mon Sep 17 00:00:00 2001 -From: Mikolaj Izdebski -Date: Thu, 30 Jul 2020 15:37:49 +0200 -Subject: [PATCH 4/8] Do not use Werken XPath - ---- - .../apache/velocity/anakia/AnakiaElement.java | 7 +++++-- - .../org/apache/velocity/anakia/NodeList.java | 6 ++++-- - .../org/apache/velocity/anakia/XPathCache.java | 9 ++++++--- - .../org/apache/velocity/anakia/XPathTool.java | 16 ++++++++++------ - 4 files changed, 25 insertions(+), 13 deletions(-) - -diff --git a/src/java/org/apache/velocity/anakia/AnakiaElement.java b/src/java/org/apache/velocity/anakia/AnakiaElement.java -index c72b653..df13153 100644 ---- a/src/java/org/apache/velocity/anakia/AnakiaElement.java -+++ b/src/java/org/apache/velocity/anakia/AnakiaElement.java -@@ -20,8 +20,10 @@ package org.apache.velocity.anakia; - */ - - import org.jdom.Element; -+import org.jdom.JDOMException; - import org.jdom.Namespace; - import org.jdom.output.XMLOutputter; -+ - import java.util.List; - - /** -@@ -126,10 +128,11 @@ public class AnakiaElement extends Element - * @param xpathExpression the XPath expression you wish to apply - * @return a NodeList representing the nodes that are the result of - * application of the XPath to the current element. It can be empty. -+ * @throws JDOMException - */ -- public NodeList selectNodes(String xpathExpression) -+ public NodeList selectNodes(String xpathExpression) throws JDOMException - { -- return new NodeList(XPathCache.getXPath(xpathExpression).applyTo(this), false); -+ return new NodeList(XPathCache.getXPath(xpathExpression).selectNodes(this), false); - } - - /** -diff --git a/src/java/org/apache/velocity/anakia/NodeList.java b/src/java/org/apache/velocity/anakia/NodeList.java -index daf611d..b303bda 100644 ---- a/src/java/org/apache/velocity/anakia/NodeList.java -+++ b/src/java/org/apache/velocity/anakia/NodeList.java -@@ -35,6 +35,7 @@ import org.jdom.DocType; - import org.jdom.Document; - import org.jdom.Element; - import org.jdom.EntityRef; -+import org.jdom.JDOMException; - import org.jdom.ProcessingInstruction; - import org.jdom.Text; - import org.jdom.output.XMLOutputter; -@@ -289,10 +290,11 @@ public class NodeList implements List, Cloneable - * @param xpathString the XPath expression you wish to apply - * @return a NodeList representing the nodes that are the result of - * application of the XPath to the current node list. It can be empty. -+ * @throws JDOMException - */ -- public NodeList selectNodes(String xpathString) -+ public NodeList selectNodes(String xpathString) throws JDOMException - { -- return new NodeList(XPathCache.getXPath(xpathString).applyTo(nodes), false); -+ return new NodeList(XPathCache.getXPath(xpathString).selectNodes(nodes), false); - } - - // List methods implemented hereafter -diff --git a/src/java/org/apache/velocity/anakia/XPathCache.java b/src/java/org/apache/velocity/anakia/XPathCache.java -index cef43d9..0d633b0 100644 ---- a/src/java/org/apache/velocity/anakia/XPathCache.java -+++ b/src/java/org/apache/velocity/anakia/XPathCache.java -@@ -19,7 +19,9 @@ package org.apache.velocity.anakia; - * under the License. - */ - --import com.werken.xpath.XPath; -+import org.jdom.JDOMException; -+import org.jdom.xpath.XPath; -+ - import java.util.Map; - import java.util.WeakHashMap; - -@@ -46,8 +48,9 @@ class XPathCache - * A cached object is returned if it already exists for the requested expression. - * @param xpathString the XPath expression to parse - * @return the XPath object that represents the parsed XPath expression. -+ * @throws JDOMException - */ -- static XPath getXPath(String xpathString) -+ static XPath getXPath(String xpathString) throws JDOMException - { - XPath xpath = null; - synchronized(XPATH_CACHE) -@@ -55,7 +58,7 @@ class XPathCache - xpath = (XPath)XPATH_CACHE.get(xpathString); - if(xpath == null) - { -- xpath = new XPath(xpathString); -+ xpath = XPath.newInstance(xpathString); - XPATH_CACHE.put(xpathString, xpath); - } - } -diff --git a/src/java/org/apache/velocity/anakia/XPathTool.java b/src/java/org/apache/velocity/anakia/XPathTool.java -index c9e6178..f85d2c1 100644 ---- a/src/java/org/apache/velocity/anakia/XPathTool.java -+++ b/src/java/org/apache/velocity/anakia/XPathTool.java -@@ -23,6 +23,7 @@ import java.util.List; - - import org.jdom.Document; - import org.jdom.Element; -+import org.jdom.JDOMException; - - /** - * This class adds an entrypoint into XPath functionality, -@@ -88,12 +89,13 @@ public class XPathTool - * @param doc The Document context - * - * @return A list of selected nodes -+ * @throws JDOMException - */ - public NodeList applyTo(String xpathSpec, -- Document doc) -+ Document doc) throws JDOMException - { - //RuntimeSingleton.info("XPathTool::applyTo(String, Document)"); -- return new NodeList(XPathCache.getXPath(xpathSpec).applyTo( doc ), false); -+ return new NodeList(XPathCache.getXPath(xpathSpec).selectNodes( doc ), false); - } - - /** -@@ -103,12 +105,13 @@ public class XPathTool - * @param elem The Element context - * - * @return A list of selected nodes -+ * @throws JDOMException - */ - public NodeList applyTo(String xpathSpec, -- Element elem) -+ Element elem) throws JDOMException - { - //RuntimeSingleton.info("XPathTool::applyTo(String, Element)"); -- return new NodeList(XPathCache.getXPath(xpathSpec).applyTo( elem ), false); -+ return new NodeList(XPathCache.getXPath(xpathSpec).selectNodes( elem ), false); - } - - /** -@@ -118,12 +121,13 @@ public class XPathTool - * @param nodeSet The nodeset context - * - * @return A list of selected nodes -+ * @throws JDOMException - */ - public NodeList applyTo(String xpathSpec, -- List nodeSet) -+ List nodeSet) throws JDOMException - { - //RuntimeSingleton.info("XPathTool::applyTo(String, List)"); -- return new NodeList(XPathCache.getXPath(xpathSpec).applyTo( nodeSet ), false); -+ return new NodeList(XPathCache.getXPath(xpathSpec).selectNodes( nodeSet ), false); - } - } - --- -2.26.2 - diff --git a/0005-Skip-Java-8-incompatible-test.patch b/0005-Skip-Java-8-incompatible-test.patch deleted file mode 100644 index 9d725d1..0000000 --- a/0005-Skip-Java-8-incompatible-test.patch +++ /dev/null @@ -1,26 +0,0 @@ -From bb1afd044489984a14b4619fed943e430f36a854 Mon Sep 17 00:00:00 2001 -From: Mikolaj Izdebski -Date: Thu, 30 Jul 2020 15:38:32 +0200 -Subject: [PATCH 5/8] Skip Java 8 incompatible test - ---- - .../org/apache/velocity/test/issues/VelTools66TestCase.java | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/test/org/apache/velocity/test/issues/VelTools66TestCase.java b/src/test/org/apache/velocity/test/issues/VelTools66TestCase.java -index 00bb0b1..6fb7260 100644 ---- a/src/test/org/apache/velocity/test/issues/VelTools66TestCase.java -+++ b/src/test/org/apache/velocity/test/issues/VelTools66TestCase.java -@@ -87,7 +87,8 @@ public class VelTools66TestCase - - Method testMethod = introspector.getMethod(TestObject.class, "getTestValue", new Object[0]); - assertNotNull(testMethod); -- assertEquals("Method object does not match!", verifyMethod, testMethod); -+ // Java 8 incompatibility -+ // assertEquals("Method object does not match!", verifyMethod, testMethod); - } - - public static interface TestInterface --- -2.26.2 - diff --git a/0006-Run-javadoc-with-Xdoclint-none.patch b/0006-Run-javadoc-with-Xdoclint-none.patch deleted file mode 100644 index ee06f53..0000000 --- a/0006-Run-javadoc-with-Xdoclint-none.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 49155f009858a9332b0d58c814f5166bba0cccde Mon Sep 17 00:00:00 2001 -From: Fabio Valentini -Date: Thu, 30 Jul 2020 15:38:59 +0200 -Subject: [PATCH 6/8] Run javadoc with -Xdoclint:none - ---- - build/build.xml | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/build/build.xml b/build/build.xml -index 479ef2d..0544f2c 100644 ---- a/build/build.xml -+++ b/build/build.xml -@@ -592,6 +592,7 @@ - doctitle="${name} ${version} API" - encoding="UTF-8" - docencoding="UTF-8" -+ additionalparam="-Xdoclint:none" - bottom="Copyright © 2000-${build.year} <a href="http://www.apache.org/">Apache Software Foundation</a>. All Rights Reserved."> - - --- -2.26.2 - diff --git a/0007-Fix-OSGi-metadata.patch b/0007-Fix-OSGi-metadata.patch deleted file mode 100644 index 8a59c9f..0000000 --- a/0007-Fix-OSGi-metadata.patch +++ /dev/null @@ -1,56 +0,0 @@ -From e025e3519d3f1e1a12bb8fb896648dfc345fdeba Mon Sep 17 00:00:00 2001 -From: Fabio Valentini -Date: Thu, 30 Jul 2020 15:39:36 +0200 -Subject: [PATCH 7/8] Fix OSGi metadata - ---- - build/build.properties | 12 ++++-------- - 1 file changed, 4 insertions(+), 8 deletions(-) - -diff --git a/build/build.properties b/build/build.properties -index aba450e..6d928bd 100644 ---- a/build/build.properties -+++ b/build/build.properties -@@ -166,8 +166,7 @@ javac.source=1.4 - - ######################################################################## - # OSGi stuff --import=com.werken.xpath;resolution:=optional,\ -- javax.naming,\ -+import=javax.naming,\ - javax.servlet;resolution:=optional,\ - javax.servlet.http;resolution:=optional,\ - javax.sql,\ -@@ -188,8 +187,7 @@ import=com.werken.xpath;resolution:=optional,\ - org.jdom.input;resolution:=optional,\ - org.jdom.output;resolution:=optional,\ - org.xml.sax --dep.import=com.werken.xpath;resolution:=optional,\ -- javax.naming,\ -+dep.import=javax.naming,\ - javax.servlet;resolution:=optional,\ - javax.servlet.http;resolution:=optional,\ - javax.sql,\ -@@ -207,8 +205,7 @@ dep.import=com.werken.xpath;resolution:=optional,\ - export=org.apache.velocity;uses:="org.apache.velocity.context,\ - org.apache.velocity.exception,\ - org.apache.velocity.runtime.resource",\ -- org.apache.velocity.anakia;uses:="com.werken.xpath,\ -- org.apache.tools.ant,\ -+ org.apache.velocity.anakia;uses:="org.apache.tools.ant,\ - org.apache.tools.ant.taskdefs,\ - org.jdom,\ - org.jdom.output",\ -@@ -327,8 +324,7 @@ dep.export=org.apache.commons.collections,\ - org.apache.velocity;uses:="org.apache.velocity.context,\ - org.apache.velocity.exception,\ - org.apache.velocity.runtime.resource",\ -- org.apache.velocity.anakia;uses:="com.werken.xpath,\ -- org.apache.tools.ant,\ -+ org.apache.velocity.anakia;uses:="org.apache.tools.ant,\ - org.apache.tools.ant.taskdefs,\ - org.jdom,\ - org.jdom.output",\ --- -2.26.2 - diff --git a/0008-Port-to-apache-commons-lang3.patch b/0008-Port-to-apache-commons-lang3.patch deleted file mode 100644 index 8fa0bf8..0000000 --- a/0008-Port-to-apache-commons-lang3.patch +++ /dev/null @@ -1,567 +0,0 @@ -From cd0a1db2ba5930de40b8f884efd492875226e9d8 Mon Sep 17 00:00:00 2001 -From: Fabio Valentini -Date: Thu, 30 Jul 2020 15:51:00 +0200 -Subject: [PATCH 8/8] Port to apache commons-lang3 - ---- - build/build.properties | 28 +++++++++---------- - pom.xml | 6 ++-- - .../event/implement/EscapeHtmlReference.java | 4 +-- - .../implement/EscapeJavaScriptReference.java | 4 +-- - .../event/implement/EscapeSqlReference.java | 5 ++-- - .../event/implement/EscapeXmlReference.java | 2 +- - .../velocity/runtime/RuntimeInstance.java | 2 +- - .../velocity/runtime/VelocimacroFactory.java | 2 +- - .../velocity/runtime/directive/Block.java | 2 +- - .../runtime/directive/RuntimeMacro.java | 2 +- - .../velocity/runtime/log/AvalonLogChute.java | 2 +- - .../velocity/runtime/parser/Parser.java | 2 +- - .../runtime/parser/ParserTokenManager.java | 2 +- - .../runtime/parser/node/ASTDirective.java | 2 +- - .../runtime/parser/node/ASTMethod.java | 4 +-- - .../runtime/parser/node/ASTStringLiteral.java | 2 +- - .../runtime/parser/node/NodeUtils.java | 2 +- - .../runtime/parser/node/PropertyExecutor.java | 2 +- - .../parser/node/SetPropertyExecutor.java | 4 +-- - .../runtime/parser/node/SimpleNode.java | 4 +-- - .../runtime/resource/ResourceManagerImpl.java | 4 +-- - .../loader/ClasspathResourceLoader.java | 2 +- - .../loader/DataSourceResourceLoader.java | 2 +- - .../resource/loader/FileResourceLoader.java | 2 +- - .../resource/loader/JarResourceLoader.java | 2 +- - .../resource/loader/StringResourceLoader.java | 2 +- - .../resource/loader/URLResourceLoader.java | 2 +- - .../velocity/util/introspection/ClassMap.java | 2 +- - src/parser/Parser.jjt | 2 +- - .../io/UnicodeInputStreamTestCase.java | 2 +- - .../apache/velocity/test/BaseTestCase.java | 2 +- - .../velocity/test/MethodCacheKeyTestCase.java | 2 +- - .../org/apache/velocity/test/sql/HsqlDB.java | 2 +- - 33 files changed, 56 insertions(+), 55 deletions(-) - -diff --git a/build/build.properties b/build/build.properties -index 6d928bd..b723852 100644 ---- a/build/build.properties -+++ b/build/build.properties -@@ -172,9 +172,9 @@ import=javax.naming,\ - javax.sql,\ - org.apache.commons.collections,\ - org.apache.commons.collections.map,\ -- org.apache.commons.lang,\ -- org.apache.commons.lang.builder,\ -- org.apache.commons.lang.text,\ -+ org.apache.commons.lang3,\ -+ org.apache.commons.lang3.builder,\ -+ org.apache.commons.lang3.text,\ - org.apache.commons.logging;resolution:=optional,\ - org.apache.log;resolution:=optional,\ - org.apache.log.format;resolution:=optional,\ -@@ -260,7 +260,7 @@ export=org.apache.velocity;uses:="org.apache.velocity.context,\ - org.apache.velocity.runtime,\ - org.apache.velocity.runtime.directive,\ - org.apache.velocity.runtime.parser.node",\ -- org.apache.velocity.runtime.parser.node;uses:="org.apache.commons.lang.text,\ -+ org.apache.velocity.runtime.parser.node;uses:="org.apache.commons.lang3.text,\ - org.apache.velocity.context,\ - org.apache.velocity.exception,\ - org.apache.velocity.runtime,\ -@@ -303,15 +303,15 @@ export=org.apache.velocity;uses:="org.apache.velocity.context,\ - dep.export=org.apache.commons.collections,\ - org.apache.commons.collections.iterators;uses:="org.apache.commons.collections",\ - org.apache.commons.collections.map;uses:="org.apache.commons.collections",\ -- org.apache.commons.lang;uses:="org.apache.commons.lang.exception",\ -- org.apache.commons.lang.builder,\ -- org.apache.commons.lang.enum,\ -- org.apache.commons.lang.enums,\ -- org.apache.commons.lang.exception,\ -- org.apache.commons.lang.math,\ -- org.apache.commons.lang.mutable,\ -- org.apache.commons.lang.text,\ -- org.apache.commons.lang.time,\ -+ org.apache.commons.lang3;uses:="org.apache.commons.lang3.exception",\ -+ org.apache.commons.lang3.builder,\ -+ org.apache.commons.lang3.enum,\ -+ org.apache.commons.lang3.enums,\ -+ org.apache.commons.lang3.exception,\ -+ org.apache.commons.lang3.math,\ -+ org.apache.commons.lang3.mutable,\ -+ org.apache.commons.lang3.text,\ -+ org.apache.commons.lang3.time,\ - org.apache.oro.io;uses:="org.apache.oro.text,\ - org.apache.oro.text.regex",\ - org.apache.oro.text;uses:="org.apache.oro.text.regex,\ -@@ -379,7 +379,7 @@ dep.export=org.apache.commons.collections,\ - org.apache.velocity.runtime,\ - org.apache.velocity.runtime.directive,\ - org.apache.velocity.runtime.parser.node",\ -- org.apache.velocity.runtime.parser.node;uses:="org.apache.commons.lang.text,\ -+ org.apache.velocity.runtime.parser.node;uses:="org.apache.commons.lang3.text,\ - org.apache.velocity.context,\ - org.apache.velocity.exception,\ - org.apache.velocity.runtime,\ -diff --git a/pom.xml b/pom.xml -index 8cb5d3f..56af634 100644 ---- a/pom.xml -+++ b/pom.xml -@@ -148,9 +148,9 @@ - 3.2.1 - - -- commons-lang -- commons-lang -- 2.4 -+ org.apache.commons -+ commons-lang3 -+ 3.8.1 - - - oro -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 6d98b45..56d1e62 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.ESCAPE_HTML4.translate(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 ea49ddb..b9196c5 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.ESCAPE_ECMASCRIPT.translate(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 585cb6c..adea560 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.StringEscapeUtils; - - /** - * 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()); -+ // commons-lang3 dropped the SQL escaper because it was incomplete -+ return 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 3d5b40f..fbb525c 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 bf99faa..a79d42c 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 2737b3b..956ab05 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 f5fdfa8..b136543 100644 ---- 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 090b552..d22ac4e 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/log/AvalonLogChute.java b/src/java/org/apache/velocity/runtime/log/AvalonLogChute.java -index f4016ca..f7e467d 100644 ---- a/src/java/org/apache/velocity/runtime/log/AvalonLogChute.java -+++ b/src/java/org/apache/velocity/runtime/log/AvalonLogChute.java -@@ -24,7 +24,7 @@ import java.io.IOException; - import java.util.HashMap; - import java.util.Map; - --import org.apache.commons.lang.StringUtils; -+import org.apache.commons.lang3.StringUtils; - import org.apache.log.Hierarchy; - import org.apache.log.LogTarget; - import org.apache.log.Logger; -diff --git a/src/java/org/apache/velocity/runtime/parser/Parser.java b/src/java/org/apache/velocity/runtime/parser/Parser.java -index 085e7a4..62dfe48 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 ce00d99..9563a1f 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 86e86b7..f1ab78d 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 a1545e5..7354c9a 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 bb56cd9..0bc63bc 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 52bcda9..8362c3e 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 8c78228..20d6c18 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 0b27b45..ba5d512 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 108846f..6372830 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 1b504eb..b33d4ed 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 623766f..a7cc276 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 833e0ac..7414913 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 462ed16..3898889 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 172384e..b7fb1a7 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 895182d..41c0ec9 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 de06636..74ab86a 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 66bc7b1..77c1c8b 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/parser/Parser.jjt b/src/parser/Parser.jjt -index 7ebdb67..f5d3c62 100644 ---- a/src/parser/Parser.jjt -+++ b/src/parser/Parser.jjt -@@ -86,7 +86,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/test/org/apache/velocity/io/UnicodeInputStreamTestCase.java b/src/test/org/apache/velocity/io/UnicodeInputStreamTestCase.java -index 3142f45..ff36682 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 9faf585..f893d0f 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 d1ad1db..e70c5f2 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; - - /** -diff --git a/src/test/org/apache/velocity/test/sql/HsqlDB.java b/src/test/org/apache/velocity/test/sql/HsqlDB.java -index 6f6c9f6..89d9d53 100644 ---- a/src/test/org/apache/velocity/test/sql/HsqlDB.java -+++ b/src/test/org/apache/velocity/test/sql/HsqlDB.java -@@ -19,7 +19,7 @@ package org.apache.velocity.test.sql; - * under the License. - */ - --import org.apache.commons.lang.StringUtils; -+import org.apache.commons.lang3.StringUtils; - - import org.hsqldb.jdbcDriver; - --- -2.26.2 - diff --git a/changelog b/changelog new file mode 100644 index 0000000..1ddf522 --- /dev/null +++ b/changelog @@ -0,0 +1,339 @@ +* Sat Jul 20 2024 Fedora Release Engineering - 2.3-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Fri May 31 2024 Mikolaj Izdebski - 2.3-6 +- Switch to a newer patch macro syntax + +* Tue Feb 27 2024 Jiri Vanek - 2.3-5 +- Rebuilt for java-21-openjdk as system jdk + +* Fri Feb 23 2024 Jiri Vanek - 2.3-4 +- bump of release for for java-21-openjdk as system jdk + +* Sat Jan 27 2024 Fedora Release Engineering - 2.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Sep 01 2023 Mikolaj Izdebski - 2.3-2 +- Convert License tag to SPDX format + +* Fri Aug 25 2023 Mikolaj Izdebski - 2.3-1 +- Update to upstream version 2.3 + +* Sat Jul 22 2023 Fedora Release Engineering - 1.7-41 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Sat Jan 21 2023 Fedora Release Engineering - 1.7-40 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Sat Jul 23 2022 Fedora Release Engineering - 1.7-39 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sat Feb 05 2022 Jiri Vanek - 1.7-38 +- Rebuilt for java-17-openjdk as system jdk + +* Sat Jan 22 2022 Fedora Release Engineering - 1.7-37 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Fri Jul 23 2021 Fedora Release Engineering - 1.7-36 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Mon May 17 2021 Mikolaj Izdebski - 1.7-35 +- Bootstrap build +- Non-bootstrap build + +* Wed Jan 27 2021 Fedora Release Engineering - 0:1.7-34 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Fri Sep 11 2020 Fabio Valentini - 0:1.7-33 +- Default to JDK logging and drop commons-logging and log4j12 implementations. + +* Thu Jul 30 2020 Fabio Valentini - 0:1.7-32 +- Port to commons-lang3. + +* Wed Jul 29 2020 Fedora Release Engineering - 0:1.7-31 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Tue Jul 14 2020 Jiri Vanek - 0:1.7-30 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + +* Mon Jul 13 2020 Mat Booth - 0:1.7-29 +- Ignore test case that fails on Java 11 + +* Sat Jul 11 2020 Jiri Vanek - 0:1.7-28 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + +* Fri May 15 2020 Mikolaj Izdebski - 1.7-27 +- Build with Maven + +* Fri Jan 31 2020 Fedora Release Engineering - 0:1.7-27 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Tue Nov 05 2019 Mikolaj Izdebski - 1.7-26 +- Mass rebuild for javapackages-tools 201902 + +* Sat Jul 27 2019 Fedora Release Engineering - 0:1.7-26 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Fri May 24 2019 Mikolaj Izdebski - 1.7-25 +- Mass rebuild for javapackages-tools 201901 + +* Sun Feb 03 2019 Fedora Release Engineering - 0:1.7-25 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Tue Jul 31 2018 Michael Simacek - 0:1.7-24 +- Repack the tarball without binaries + +* Sat Jul 14 2018 Fedora Release Engineering - 0:1.7-23 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Fri Feb 09 2018 Fedora Release Engineering - 0:1.7-22 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Thu Jul 27 2017 Fedora Release Engineering - 0:1.7-21 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Tue Feb 07 2017 Michael Simacek - 0:1.7-20 +- Add hsqldb conditional +- Switch to glassfish-servlet-api + +* Fri Feb 05 2016 Fedora Release Engineering - 0:1.7-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Wed Jul 22 2015 gil cattaneo 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 - 0:1.7-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Fri Nov 28 2014 Mikolaj Izdebski - 0:1.7-16 +- Update to current packaging guidelines + +* Thu Sep 4 2014 Mikolaj Izdebski - 0:1.7-15 +- Require hsqldb-lib instead of hsqldb + +* Wed Jun 18 2014 Mikolaj Izdebski - 0:1.7-14 +- Apply patch for log4j 1.2.17 + +* Wed Jun 18 2014 Mikolaj Izdebski - 0:1.7-13 +- Use log4j 1.2 compat package +- Skip Java 8 incompatible test + +* Sun Jun 08 2014 Fedora Release Engineering - 0:1.7-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Wed May 21 2014 Mikolaj Izdebski - 0:1.7-11 +- Use .mfiles generated during build + +* Sat Sep 21 2013 Mikolaj Izdebski - 0:1.7-10 +- Port from werken-xpath to jdom +- Resolves: rhbz#875817 + +* Mon Aug 05 2013 Michal Srb - 0:1.7-9 +- Fix FTBFS (Resolves: #992852) + +* Sun Aug 04 2013 Fedora Release Engineering - 0:1.7-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Fri Feb 15 2013 Fedora Release Engineering - 0:1.7-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Wed Nov 21 2012 Mikolaj Izdebski - 0:1.7-6 +- Install NOTICE files +- Resolves: rhbz#879021 + +* Sun Jul 22 2012 Fedora Release Engineering - 0:1.7-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Tue Jun 05 2012 Stanislav Ochotnicky - 0:1.7-4 +- Use new tomcat-servlet-api +- Update to latest guidelines + +* Fri Feb 17 2012 Deepak Bhole - 0:1.7-3 +- Resolved rhbz#791045 +- Added patch from Omaid Majid to fix build with Java 7 + +* Sat Jan 14 2012 Fedora Release Engineering - 0:1.7-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Mon Feb 21 2011 Stanislav Ochotnicky - 0:1.7-1 +- Update to latest version +- Drop old patches + +* Mon Feb 07 2011 Fedora Release Engineering - 0:1.6.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Fri Dec 17 2010 Stanislav Ochotnicky - 0:1.6.4-2 +- Add compatibility depmap + +* Wed Nov 3 2010 Stanislav Ochotnicky - 0:1.6.4-1 +- Rebase to latest upstream +- Fix problems from bz#226525 + +* Thu Oct 14 2010 Stanislav Ochotnicky - 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 0:1.6.3-4 +- Fix BR/R for jakarta-commons-rename. + +* Sat Feb 13 2010 Mary Ellen Foster 0:1.6.3-3 +- Get (Build)Requires right + +* Sat Feb 13 2010 Mary Ellen Foster 0:1.6.3-2 +- Require all of the packages in the POM +- Add dist to version + +* Fri Jan 15 2010 Mary Ellen Foster 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 0:1.4-10.5 +- Drop gcj_support. +- Fix groups and url. +- Use upstream tarball. + +* Mon Aug 10 2009 Ville Skyttä - 0:1.4-10.4 +- Convert specfile to UTF-8. + +* Sun Jul 26 2009 Fedora Release Engineering - 0:1.4-9.4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Fri Apr 24 2009 Milos Jakubicek - 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 - 0:1.4-8.3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Thu Jul 10 2008 Tom "spot" Callaway - 0:1.4-7.3 +- drop repotag + +* Thu May 29 2008 Tom "spot" Callaway - 0:1.4-7jpp.2 +- fix license tag + +* Tue Feb 19 2008 Fedora Release Engineering - 0:1.4-7jpp.1 +- Autorebuild for GCC 4.3 + +* Tue Aug 08 2006 Vivek Lakshmanan - 0:1.4-6jpp.1 +- Resync with latest from JPP. +- Partially adopt new naming convention. + +* Sat Jul 22 2006 Vivek Lakshmanan - 0:1.4-5jpp_2fc +- Rebuilt + +* Sat Jul 22 2006 Vivek Lakshmanan - 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 - 0:1.4-3jpp_8fc +- Rebuilt + +* Tue Jul 18 2006 Deepak Bhole - 0:1.4-3jpp_7fc +- Build on all archs. + +* Wed Jul 12 2006 Jesse Keating - 0:1.4-3jpp_6fc +- rebuild + +* Wed Mar 8 2006 Rafael Schloming - 0:1.4-3jpp_5fc +- excluded s390[x] and ppc64 due to eclipse + +* Mon Mar 6 2006 Jeremy Katz - 0:1.4-3jpp_4fc +- stop scriptlet spew + +* Wed Dec 21 2005 Jesse Keating - 0:1.4-3jpp_3fc +- rebuilt again + +* Fri Dec 09 2005 Jesse Keating - 0:1.4-3jpp_2fc +- rebuilt + +* Tue Nov 8 2005 Vadim Nasardinov - 0:1.4-3jpp_1fc +- Converted from ISO-8859-1 to UTF-8 + +* Wed Jun 15 2005 Gary Benson 0:1.4-3jpp_1fc +- Build into Fedora. + +* Thu Jun 9 2005 Gary Benson +- Remove jarfiles from the tarball. + +* Mon Jun 6 2005 Gary Benson +- Build with servletapi5. +- Add NOTICE file as per Apache License version 2.0. +- Skip some failing tests. + +* Mon Oct 18 2004 Fernando Nasser 0:1.4-3jpp_1rh +- First Red Hat build + +* Thu Sep 23 2004 Ralph Apel 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 0:1.4-2jpp +- Build with ant-1.6.2 + +* Mon Jun 07 2004 Kaj J. Niemi 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 0:1.4-0.rc1.2jpp +- Fix a few jpackage related .spec typos, oops. + +* Wed Feb 18 2004 Kaj J. Niemi 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ä - 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 1.3.1-1jpp +- 1.3.1 stable release + +* Fri May 23 2003 Richard Bullington-McGuire 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 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 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 1.1-4jpp +- javadoc into javadoc package + +* Wed Nov 21 2001 Christian Zoffoli 1.1-3jpp +- removed packager tag +- new jpp extension + +* Thu Nov 1 2001 Guillaume Rousse 1.1-2jpp +- first unified release +- s/jPackage/JPackage + +* Fri Sep 14 2001 Guillaume Rousse 1.1-1jpp +- first Mandrake release diff --git a/ci.fmf b/ci.fmf new file mode 100644 index 0000000..c5aa0e0 --- /dev/null +++ b/ci.fmf @@ -0,0 +1 @@ +resultsdb-testcase: separate diff --git a/gating.yaml b/gating.yaml new file mode 100644 index 0000000..0d484d7 --- /dev/null +++ b/gating.yaml @@ -0,0 +1,8 @@ +--- !Policy +product_versions: + - fedora-* +decision_contexts: + - bodhi_update_push_testing + - bodhi_update_push_stable +rules: + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/javapackages.functional} diff --git a/generate-tarball.sh b/generate-tarball.sh deleted file mode 100755 index a86a470..0000000 --- a/generate-tarball.sh +++ /dev/null @@ -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 -cd tarball-tmp -tar xf "../${name}-${version}.orig.tar.gz" - -# CLEAN TARBALL -rm -r */*.jar -rm -r */lib - -tar cf "../${name}-${version}.tar.gz" * -cd .. -rm -r tarball-tmp "${name}-${version}.orig.tar.gz" diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf new file mode 100644 index 0000000..ae17c0c --- /dev/null +++ b/plans/javapackages.fmf @@ -0,0 +1,7 @@ +summary: Run javapackages-specific tests +discover: + how: fmf + url: https://gitlab.com/redhat/centos-stream/tests/javapackages.git + ref: f43 +execute: + how: tmt diff --git a/sources b/sources index 7928f22..408171e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (velocity-1.7.tar.gz) = d305642aab3c837ad250deaa46b516561fb68f92d04fc205fd4f40eb774ba6286ed3b239ee6352bc4411bd11cb4d1d5b39ce9ab8467f0e1ffceed9f9fc5a228d +SHA512 (velocity-2.4.1.tar.gz) = 3e821eaeb705e6ede8a51a8d3bff00d26909c20738bed92f5ef9600f3736709324807f7bbb93f5d431e60380b9a4f757f47cca6ec64e8e774c7ec1e4708d25f1 diff --git a/velocity-1.7.pom b/velocity-1.7.pom deleted file mode 100644 index 31d7de2..0000000 --- a/velocity-1.7.pom +++ /dev/null @@ -1,340 +0,0 @@ - - - - - - - 4.0.0 - - - org.apache - apache - 4 - - - org.apache.velocity - velocity - 1.7 - - Apache Velocity - http://velocity.apache.org/engine/devel/ - Apache Velocity is a general purpose template engine. - 2000 - jar - - - 2.0.9 - - - - install - src/java - src/test - - - org.apache.maven.plugins - maven-site-plugin - - UTF-8 - UTF-8 - ${basedir}/xdocs/docs - - - - - - src/java - - **/*.java - - - - - - - - velocity.apache.org - scpexe://people.apache.org/www/velocity.apache.org/engine/releases/velocity-1.7 - - - apache.releases - Apache Release Distribution Repository - scp://people.apache.org/www/people.apache.org/repo/m2-ibiblio-rsync-repository - - - apache.snapshots - Apache Development Snapshot Repository - scp://people.apache.org/www/people.apache.org/repo/m2-snapshot-repository - - - - - - Will Glass-Husain - wglass - wglass@forio.com - Forio Business Simulations - - Java Developer - - - - - Geir Magnusson Jr. - geirm - geirm@optonline.net - Independent (DVSL Maven) - - Java Developer - - - - - Daniel Rall - dlr - dlr@finemaltcoding.com - CollabNet, Inc. - - Java Developer - - - - - Henning P. Schmiedehausen - henning - hps@intermeta.de - INTERMETA - Gesellschaft für Mehrwertdienste mbH - - Java Developer - - 2 - - - - Nathan Bubna - nbubna - nathan@esha.com - ESHA Research - - Java Developer - - - - - - - - commons-collections - commons-collections - 3.2.1 - - - commons-lang - commons-lang - 2.4 - - - oro - oro - 2.0.8 - true - - - jdom - jdom - 1.0 - provided - - - commons-logging - commons-logging - 1.1 - provided - - - avalon-framework - avalon-framework - - - log4j - log4j - - - javax.servlet - servlet-api - - - - - javax.servlet - servlet-api - 2.3 - provided - - - logkit - logkit - 2.0 - provided - - - ant - ant - 1.6 - provided - - - werken-xpath - werken-xpath - 0.9.4 - provided - - - junit - junit - 3.8.1 - test - - - hsqldb - hsqldb - 1.7.1 - test - - - - - - - org.apache.maven.plugins - maven-project-info-reports-plugin - 2.1 - - - - dependencies - issue-tracking - license - summary - scm - - - - - - org.apache.maven.plugins - maven-changes-plugin - 2.0 - - - - changes-report - jira-report - - - - - ${jira.browse.url}/%ISSUE% - - 12311337 - - fixfor=12310290&sorter/field=issuekey&sorter/order=ASC - 100 - http://velocity.apache.org/who-we-are.html - - - - org.codehaus.mojo - taglist-maven-plugin - 2.2 - - TODO - FIXME - - - - org.apache.maven.plugins - maven-jxr-plugin - 2.1 - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.5 - - - http://java.sun.com/j2se/1.4.2/docs/api - http://jakarta.apache.org/oro/api - http://jakarta.apache.org/commons/lang/api-release - http://jakarta.apache.org/commons/collections/api-release - - http://www.jdom.org/docs/apidocs - http://logging.apache.org/log4j/docs/api - http://excalibur.apache.org/apidocs - http://tomcat.apache.org/tomcat-4.1-doc/servletapi - - - - - org.apache.maven.plugins - maven-changelog-plugin - 2.1 - - - org.codehaus.mojo - findbugs-maven-plugin - 1.2 - - true - Low - Max - build/findbugs-exclude.xml - xdocs - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.4 - 1.4 - - - - - - - scm:svn:http://svn.apache.org/repos/asf/velocity/engine/trunk - scm:svn:https://svn.apache.org/repos/asf/velocity/engine/trunk - HEAD - http://svn.apache.org/viewvc/velocity/engine/trunk - - - - https://issues.apache.org/jira/browse - - - - JIRA - ${jira.browse.url}/VELOCITY - - diff --git a/velocity.spec b/velocity.spec index 3de2c5d..adafefe 100644 --- a/velocity.spec +++ b/velocity.spec @@ -1,45 +1,32 @@ -%bcond_without hsqldb +%bcond_with bootstrap Name: velocity -Version: 1.7 -Release: 34%{?dist} -Epoch: 0 +Version: 2.4.1 +Release: %autorelease Summary: Java-based template engine -License: ASL 2.0 -URL: http://velocity.apache.org/ +License: Apache-2.0 +URL: https://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 -Patch0: 0000-Remove-avalon-logkit.patch -Patch2: 0002-Use-system-jars.patch -Patch3: 0003-JDBC-41-compat.patch -Patch4: 0004-Do-not-use-Werken-XPath.patch -Patch5: 0005-Skip-Java-8-incompatible-test.patch -Patch6: 0006-Run-javadoc-with-Xdoclint-none.patch -Patch7: 0007-Fix-OSGi-metadata.patch -Patch8: 0008-Port-to-apache-commons-lang3.patch +Patch: 0001-Template-is-a-reserved-keyword-in-javacc.patch -BuildRequires: ant -BuildRequires: ant-junit -BuildRequires: antlr -BuildRequires: apache-commons-collections -BuildRequires: apache-commons-lang3 -BuildRequires: apache-parent -BuildRequires: bcel -%if %{with hsqldb} -BuildRequires: hsqldb-lib +%if %{with bootstrap} +BuildRequires: javapackages-bootstrap +%else +BuildRequires: maven-local-openjdk25 +BuildRequires: mvn(commons-io:commons-io) +BuildRequires: mvn(junit:junit) +BuildRequires: mvn(org.apache.commons:commons-lang3) +BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) +BuildRequires: mvn(org.apache.maven.plugins:maven-source-plugin) +BuildRequires: mvn(org.codehaus.mojo:javacc-maven-plugin) +BuildRequires: mvn(org.slf4j:slf4j-api) %endif -BuildRequires: glassfish-servlet-api -BuildRequires: jakarta-oro -BuildRequires: javapackages-local -BuildRequires: jaxen -BuildRequires: jdom -BuildRequires: junit +# TODO Remove in Fedora 46 +Obsoletes: %{name}-javadoc < 2.3-21 %description Velocity is a Java-based template engine. It permits anyone to use the @@ -62,424 +49,39 @@ 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 manual -Summary: Manual for %{name} - -%description manual -Documentation for %{name}. - -%package javadoc -Summary: Javadoc for %{name} - -%description javadoc -Javadoc for %{name}. - -%package demo -Summary: Demo for %{name} -Requires: %{name} = %{epoch}:%{version}-%{release} - -%description demo -Demonstrations and samples for %{name}. - -# ----------------------------------------------------------------------------- - %prep -%setup -q +%autosetup -p1 -C -# remove bundled libs/classes (except those used for testing) -find . -name '*.jar' ! -name 'test*.jar' -print -delete -find . -name '*.class' ! -name 'Foo.class' -print -delete +%mvn_alias : velocity:velocity +%mvn_alias : org.apache.velocity:velocity -cp %{SOURCE1} ./pom.xml +%pom_remove_parent +%pom_xpath_inject pom:project "org.apache.velocity" -# remove rest of avalon logkit refences and default to JDK logging -%patch0 -p1 +%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 -# Use system jar files instead of downloading from net -%patch2 -p1 +%pom_remove_plugin :maven-javadoc-plugin -%patch3 -p1 +%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 -# Use jdom instead of werken-xpath -%patch4 -p1 -%pom_remove_dep werken-xpath: -# Skip Java 8 incompatible test -%patch5 -p1 - -# Disable Java8 doclint -%patch6 -p1 - -# Remove werken-xpath Import/Export refences in OSGi manifest file -%patch7 -p1 - -# Port to apache commons-lang3 -%patch8 -p1 - -# Remove dependency on avalon-logkit -rm src/java/org/apache/velocity/runtime/log/AvalonLogChute.java -rm src/java/org/apache/velocity/runtime/log/AvalonLogSystem.java -rm src/java/org/apache/velocity/runtime/log/VelocityFormatter.java - -# Remove dependency on log4j12 -rm src/java/org/apache/velocity/runtime/log/Log4JLogChute.java -rm src/java/org/apache/velocity/runtime/log/Log4JLogSystem.java -rm src/java/org/apache/velocity/runtime/log/SimpleLog4JLogSystem.java - -# Remove dependency on commons-logging -rm src/java/org/apache/velocity/runtime/log/CommonsLogLogChute.java - -# need porting to new servlet API. We would just add a lot of empty functions -rm src/test/org/apache/velocity/test/VelocityServletTestCase.java - -# This test doesn't work with new hsqldb -rm src/test/org/apache/velocity/test/sql/DataSourceResourceLoaderTestCase.java - -%if %{without hsqldb} -rm -r src/test/org/apache/velocity/test/sql/ -%endif - -# ----------------------------------------------------------------------------- +%pom_xpath_remove "pom:dependency[pom:scope='test']" velocity-engine-core %build -export CLASSPATH=$(build-classpath \ -antlr \ -apache-commons-collections \ -commons-lang3 \ -glassfish-servlet-api \ -jakarta-oro \ -junit \ -jaxen \ -jdom \ -bcel \ -hsqldb \ -junit) -ant \ - -buildfile build/build.xml \ - -Dbuild.sysclasspath=first \ - -Djavac.target=1.6 \ - -Djavac.source=1.6 \ - -Dtest.haltonfailure=false \ - jar javadocs test - -# fix line-endings in generated files -sed -i 's/\r//' docs/api/stylesheet.css docs/api/package-list - -# ----------------------------------------------------------------------------- +%mvn_build -j -f %install -%mvn_file : %{name} -%mvn_alias : %{name}:%{name} -%mvn_artifact pom.xml bin/%{name}-%{version}.jar -%mvn_install -J docs/api - -# zero-length file -rm -r test/issues/velocity-537/compare/velocity537.vm.cmp -# data -install -d -m 755 %{buildroot}%{_datadir}/%{name} -cp -pr examples test %{buildroot}%{_datadir}/%{name} - +%mvn_install %files -f .mfiles -%doc README.txt +%doc README.md %license LICENSE NOTICE -%files manual -%license LICENSE NOTICE -%doc docs/* - -%files javadoc -f .mfiles-javadoc -%license LICENSE NOTICE - -%files demo -%license LICENSE NOTICE -%{_datadir}/%{name} - %changelog -* Wed Jan 27 2021 Fedora Release Engineering - 0:1.7-34 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Fri Sep 11 2020 Fabio Valentini - 0:1.7-33 -- Default to JDK logging and drop commons-logging and log4j12 implementations. - -* Thu Jul 30 2020 Fabio Valentini - 0:1.7-32 -- Port to commons-lang3. - -* Wed Jul 29 2020 Fedora Release Engineering - 0:1.7-31 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Tue Jul 14 2020 Jiri Vanek - 0:1.7-30 -- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 - -* Mon Jul 13 2020 Mat Booth - 0:1.7-29 -- Ignore test case that fails on Java 11 - -* Sat Jul 11 2020 Jiri Vanek - 0:1.7-28 -- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 - -* Fri Jan 31 2020 Fedora Release Engineering - 0:1.7-27 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Sat Jul 27 2019 Fedora Release Engineering - 0:1.7-26 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Sun Feb 03 2019 Fedora Release Engineering - 0:1.7-25 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Tue Jul 31 2018 Michael Simacek - 0:1.7-24 -- Repack the tarball without binaries - -* Sat Jul 14 2018 Fedora Release Engineering - 0:1.7-23 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Fri Feb 09 2018 Fedora Release Engineering - 0:1.7-22 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering - 0:1.7-21 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Tue Feb 07 2017 Michael Simacek - 0:1.7-20 -- Add hsqldb conditional -- Switch to glassfish-servlet-api - -* Fri Feb 05 2016 Fedora Release Engineering - 0:1.7-19 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Wed Jul 22 2015 gil cattaneo 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 - 0:1.7-17 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Fri Nov 28 2014 Mikolaj Izdebski - 0:1.7-16 -- Update to current packaging guidelines - -* Thu Sep 4 2014 Mikolaj Izdebski - 0:1.7-15 -- Require hsqldb-lib instead of hsqldb - -* Wed Jun 18 2014 Mikolaj Izdebski - 0:1.7-14 -- Apply patch for log4j 1.2.17 - -* Wed Jun 18 2014 Mikolaj Izdebski - 0:1.7-13 -- Use log4j 1.2 compat package -- Skip Java 8 incompatible test - -* Sun Jun 08 2014 Fedora Release Engineering - 0:1.7-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Wed May 21 2014 Mikolaj Izdebski - 0:1.7-11 -- Use .mfiles generated during build - -* Sat Sep 21 2013 Mikolaj Izdebski - 0:1.7-10 -- Port from werken-xpath to jdom -- Resolves: rhbz#875817 - -* Mon Aug 05 2013 Michal Srb - 0:1.7-9 -- Fix FTBFS (Resolves: #992852) - -* Sun Aug 04 2013 Fedora Release Engineering - 0:1.7-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Fri Feb 15 2013 Fedora Release Engineering - 0:1.7-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Wed Nov 21 2012 Mikolaj Izdebski - 0:1.7-6 -- Install NOTICE files -- Resolves: rhbz#879021 - -* Sun Jul 22 2012 Fedora Release Engineering - 0:1.7-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Tue Jun 05 2012 Stanislav Ochotnicky - 0:1.7-4 -- Use new tomcat-servlet-api -- Update to latest guidelines - -* Fri Feb 17 2012 Deepak Bhole - 0:1.7-3 -- Resolved rhbz#791045 -- Added patch from Omaid Majid to fix build with Java 7 - -* Sat Jan 14 2012 Fedora Release Engineering - 0:1.7-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Mon Feb 21 2011 Stanislav Ochotnicky - 0:1.7-1 -- Update to latest version -- Drop old patches - -* Mon Feb 07 2011 Fedora Release Engineering - 0:1.6.4-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Fri Dec 17 2010 Stanislav Ochotnicky - 0:1.6.4-2 -- Add compatibility depmap - -* Wed Nov 3 2010 Stanislav Ochotnicky - 0:1.6.4-1 -- Rebase to latest upstream -- Fix problems from bz#226525 - -* Thu Oct 14 2010 Stanislav Ochotnicky - 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 0:1.6.3-4 -- Fix BR/R for jakarta-commons-rename. - -* Sat Feb 13 2010 Mary Ellen Foster 0:1.6.3-3 -- Get (Build)Requires right - -* Sat Feb 13 2010 Mary Ellen Foster 0:1.6.3-2 -- Require all of the packages in the POM -- Add dist to version - -* Fri Jan 15 2010 Mary Ellen Foster 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 0:1.4-10.5 -- Drop gcj_support. -- Fix groups and url. -- Use upstream tarball. - -* Mon Aug 10 2009 Ville Skyttä - 0:1.4-10.4 -- Convert specfile to UTF-8. - -* Sun Jul 26 2009 Fedora Release Engineering - 0:1.4-9.4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Fri Apr 24 2009 Milos Jakubicek - 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 - 0:1.4-8.3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Thu Jul 10 2008 Tom "spot" Callaway - 0:1.4-7.3 -- drop repotag - -* Thu May 29 2008 Tom "spot" Callaway - 0:1.4-7jpp.2 -- fix license tag - -* Tue Feb 19 2008 Fedora Release Engineering - 0:1.4-7jpp.1 -- Autorebuild for GCC 4.3 - -* Tue Aug 08 2006 Vivek Lakshmanan - 0:1.4-6jpp.1 -- Resync with latest from JPP. -- Partially adopt new naming convention. - -* Sat Jul 22 2006 Vivek Lakshmanan - 0:1.4-5jpp_2fc -- Rebuilt - -* Sat Jul 22 2006 Vivek Lakshmanan - 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 - 0:1.4-3jpp_8fc -- Rebuilt - -* Tue Jul 18 2006 Deepak Bhole - 0:1.4-3jpp_7fc -- Build on all archs. - -* Wed Jul 12 2006 Jesse Keating - 0:1.4-3jpp_6fc -- rebuild - -* Wed Mar 8 2006 Rafael Schloming - 0:1.4-3jpp_5fc -- excluded s390[x] and ppc64 due to eclipse - -* Mon Mar 6 2006 Jeremy Katz - 0:1.4-3jpp_4fc -- stop scriptlet spew - -* Wed Dec 21 2005 Jesse Keating - 0:1.4-3jpp_3fc -- rebuilt again - -* Fri Dec 09 2005 Jesse Keating - 0:1.4-3jpp_2fc -- rebuilt - -* Tue Nov 8 2005 Vadim Nasardinov - 0:1.4-3jpp_1fc -- Converted from ISO-8859-1 to UTF-8 - -* Wed Jun 15 2005 Gary Benson 0:1.4-3jpp_1fc -- Build into Fedora. - -* Thu Jun 9 2005 Gary Benson -- Remove jarfiles from the tarball. - -* Mon Jun 6 2005 Gary Benson -- Build with servletapi5. -- Add NOTICE file as per Apache License version 2.0. -- Skip some failing tests. - -* Mon Oct 18 2004 Fernando Nasser 0:1.4-3jpp_1rh -- First Red Hat build - -* Thu Sep 23 2004 Ralph Apel 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 0:1.4-2jpp -- Build with ant-1.6.2 - -* Mon Jun 07 2004 Kaj J. Niemi 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 0:1.4-0.rc1.2jpp -- Fix a few jpackage related .spec typos, oops. - -* Wed Feb 18 2004 Kaj J. Niemi 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ä - 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 1.3.1-1jpp -- 1.3.1 stable release - -* Fri May 23 2003 Richard Bullington-McGuire 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 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 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 1.1-4jpp -- javadoc into javadoc package - -* Wed Nov 21 2001 Christian Zoffoli 1.1-3jpp -- removed packager tag -- new jpp extension - -* Thu Nov 1 2001 Guillaume Rousse 1.1-2jpp -- first unified release -- s/jPackage/JPackage - -* Fri Sep 14 2001 Guillaume Rousse 1.1-1jpp -- first Mandrake release +%autochangelog