Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package velocity for openSUSE:Factory
checked in at 2023-09-28 00:25:24
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/velocity (Old)
and /work/SRC/openSUSE:Factory/.velocity.new.23327 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "velocity"
Thu Sep 28 00:25:24 2023 rev:27 rq:1113771 version:1.7
Changes:
--------
--- /work/SRC/openSUSE:Factory/velocity/velocity.changes 2022-03-22
19:41:21.595162903 +0100
+++ /work/SRC/openSUSE:Factory/.velocity.new.23327/velocity.changes
2023-09-28 00:27:03.344052210 +0200
@@ -1,0 +2,12 @@
+Wed Sep 27 04:36:41 UTC 2023 - Fridrich Strba <fst...@suse.com>
+
+- Reduce considerably the dependencies graph
+- Added patches:
+ * velocity-1.7-commons-lang3.patch
+ + port from apache-commons-lang to apache-commons-lang3
+ * velocity-1.7-log-chute.patch
+ + make JDK's own logging provider as default so that the others
+ can be removed and dependencies on other logging frameworks
+ with them
+
+-------------------------------------------------------------------
New:
----
velocity-1.7-commons-lang3.patch
velocity-1.7-log-chute.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ velocity.spec ++++++
--- /var/tmp/diff_new_pack.6sn3uf/_old 2023-09-28 00:27:04.580096826 +0200
+++ /var/tmp/diff_new_pack.6sn3uf/_new 2023-09-28 00:27:04.580096826 +0200
@@ -1,7 +1,7 @@
#
# spec file for package velocity
#
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -27,33 +27,14 @@
Source1: %{name}-%{version}.pom
Patch0: velocity-build_xml.patch
Patch1: velocity-1.7-CVE-2020-13936.patch
-BuildRequires: ant >= 1.6.5
-BuildRequires: ant-junit
-BuildRequires: antlr
-BuildRequires: avalon-logkit
+Patch2: velocity-1.7-commons-lang3.patch
+Patch3: velocity-1.7-log-chute.patch
+BuildRequires: ant
BuildRequires: commons-collections
-BuildRequires: commons-lang
-BuildRequires: commons-logging
+BuildRequires: commons-lang3
BuildRequires: fdupes
-BuildRequires: hsqldb
BuildRequires: java-devel >= 1.8
-BuildRequires: javapackages-local
-BuildRequires: jdom >= 1.0-1
-BuildRequires: junit
-BuildRequires: oro
-BuildRequires: plexus-classworlds
-BuildRequires: reload4j
-BuildRequires: servletapi4
-BuildRequires: werken-xpath
-Requires: avalon-logkit
-Requires: commons-collections
-Requires: commons-lang
-Requires: java >= 1.8
-Requires: jdom >= 1.0-1
-Requires: oro
-Requires: reload4j
-Requires: servletapi4
-Requires: werken-xpath
+BuildRequires: javapackages-local >= 6
BuildArch: noarch
%description
@@ -155,48 +136,38 @@
%prep
%setup -q
-# Remove all binary libs used in compiling the package.
-# Note that velocity has some jar files containing macros under
-# examples and test that should not be removed.
-#find build -name '*.jar' -exec rm -f \{\} \;
-for j in $(find . -name "*.jar" | grep -v /test/); do
- mv $j $j.no
-done
+cp %{SOURCE1} pom.xml
%patch0 -b .sav0
%patch1 -p1
+%patch2 -p1
+%patch3 -p1
-cp %{SOURCE1} pom.xml
+find . -name '*.jar' -print -delete
+find . -name '*.class' -print -delete
-%pom_remove_parent pom.xml
+# 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
%build
-# Use servletapi4 instead of servletapi5 in CLASSPATH
-mkdir -p bin/test-lib
-pushd bin/test-lib
-ln -sf $(build-classpath hsqldb)
-ln -sf $(build-classpath junit)
-popd
mkdir -p bin/lib
-pushd bin/lib
-ln -sf $(build-classpath ant)
-ln -sf $(build-classpath antlr)
-ln -sf $(build-classpath avalon-logkit)
-ln -sf $(build-classpath commons-collections)
-ln -sf $(build-classpath commons-lang)
-ln -sf $(build-classpath commons-logging)
-ln -sf $(build-classpath jdom)
-ln -sf $(build-classpath reload4j/reload4j)
-ln -sf $(build-classpath oro)
-# Use servletapi4 instead of servletapi5 in CLASSPATH
-ln -sf $(build-classpath servletapi4)
-ln -sf $(build-classpath werken-xpath)
-ln -sf $(build-classpath plexus/classworlds)
-popd
-export CLASSPATH=$(build-classpath jdom commons-collections commons-lang
werken-xpath antlr)
-CLASSPATH=$CLASSPATH:$(pwd)/test/texen-classpath/test.jar
-export OPT_JAR_LIST="ant/ant-junit junit"
-#FIXME: tests failed on CommonsExtPropTestCase
-#but resulting files seems to be same
+build-jar-repository -s -p bin/lib commons-collections commons-lang3
+
+export CLASSPATH=$(build-classpath commons-collections commons-lang3)
+
ant \
-Djavac.source=1.8 -Djavac.target=1.8 \
-buildfile build/build.xml \
@@ -208,7 +179,7 @@
install -p -m 644 bin/%{name}-%{version}.jar
%{buildroot}%{_javadir}/%{name}.jar
# pom
install -d -m 755 %{buildroot}%{_mavenpomdir}
-install -pm 644 pom.xml \
+%{mvn_install_pom} pom.xml \
%{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
%add_maven_depmap -a velocity:velocity
++++++ velocity-1.7-commons-lang3.patch ++++++
--- velocity-1.7/pom.xml 2023-09-27 00:55:09.936941022 +0200
+++ velocity-1.7/pom.xml 2023-09-27 00:55:44.023830711 +0200
@@ -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>
---
velocity-1.7/src/java/org/apache/velocity/app/event/implement/EscapeHtmlReference.java
2023-09-27 00:55:09.973607930 +0200
+++
velocity-1.7/src/java/org/apache/velocity/app/event/implement/EscapeHtmlReference.java
2023-09-27 00:55:44.023830711 +0200
@@ -19,7 +19,7 @@
* under the License.
*/
-import org.apache.commons.lang.StringEscapeUtils;
+import org.apache.commons.lang3.StringEscapeUtils;
/**
* Escape all HTML entities.
@@ -39,7 +39,7 @@
*/
protected String escape(Object text)
{
- return StringEscapeUtils.escapeHtml(text.toString());
+ return StringEscapeUtils.escapeHtml4(text.toString());
}
/**
---
velocity-1.7/src/java/org/apache/velocity/app/event/implement/EscapeJavaScriptReference.java
2023-09-27 00:55:09.973607930 +0200
+++
velocity-1.7/src/java/org/apache/velocity/app/event/implement/EscapeJavaScriptReference.java
2023-09-27 00:55:44.023830711 +0200
@@ -19,7 +19,7 @@
* 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 @@
*/
protected String escape(Object text)
{
- return StringEscapeUtils.escapeJavaScript(text.toString());
+ return StringEscapeUtils.escapeEcmaScript(text.toString());
}
/**
---
velocity-1.7/src/java/org/apache/velocity/app/event/implement/EscapeSqlReference.java
2023-09-27 00:55:09.973607930 +0200
+++
velocity-1.7/src/java/org/apache/velocity/app/event/implement/EscapeSqlReference.java
2023-09-27 00:55:44.023830711 +0200
@@ -19,7 +19,7 @@
* 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 @@
*/
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(), "'", "''");
}
/**
---
velocity-1.7/src/java/org/apache/velocity/app/event/implement/EscapeXmlReference.java
2023-09-27 00:55:09.973607930 +0200
+++
velocity-1.7/src/java/org/apache/velocity/app/event/implement/EscapeXmlReference.java
2023-09-27 00:55:44.023830711 +0200
@@ -19,7 +19,7 @@
* under the License.
*/
-import org.apache.commons.lang.StringEscapeUtils;
+import org.apache.commons.lang3.StringEscapeUtils;
/**
* Escape all XML entities.
--- velocity-1.7/src/java/org/apache/velocity/runtime/directive/Block.java
2023-09-27 00:55:09.976941285 +0200
+++ velocity-1.7/src/java/org/apache/velocity/runtime/directive/Block.java
2023-09-27 00:55:44.023830711 +0200
@@ -23,7 +23,7 @@
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;
---
velocity-1.7/src/java/org/apache/velocity/runtime/directive/RuntimeMacro.java
2023-09-27 00:55:09.976941285 +0200
+++
velocity-1.7/src/java/org/apache/velocity/runtime/directive/RuntimeMacro.java
2023-09-27 00:55:44.027164066 +0200
@@ -23,7 +23,7 @@
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;
---
velocity-1.7/src/java/org/apache/velocity/runtime/parser/node/ASTDirective.java
2023-09-27 00:55:09.976941285 +0200
+++
velocity-1.7/src/java/org/apache/velocity/runtime/parser/node/ASTDirective.java
2023-09-27 00:55:44.027164066 +0200
@@ -22,7 +22,7 @@
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;
---
velocity-1.7/src/java/org/apache/velocity/runtime/parser/node/ASTMethod.java
2023-09-27 00:55:09.980274640 +0200
+++
velocity-1.7/src/java/org/apache/velocity/runtime/parser/node/ASTMethod.java
2023-09-27 00:55:44.027164066 +0200
@@ -21,8 +21,8 @@
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;
---
velocity-1.7/src/java/org/apache/velocity/runtime/parser/node/ASTStringLiteral.java
2023-09-27 00:55:09.980274640 +0200
+++
velocity-1.7/src/java/org/apache/velocity/runtime/parser/node/ASTStringLiteral.java
2023-09-27 00:55:44.027164066 +0200
@@ -21,7 +21,7 @@
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;
---
velocity-1.7/src/java/org/apache/velocity/runtime/parser/node/NodeUtils.java
2023-09-27 00:55:09.980274640 +0200
+++
velocity-1.7/src/java/org/apache/velocity/runtime/parser/node/NodeUtils.java
2023-09-27 00:55:44.027164066 +0200
@@ -19,7 +19,7 @@
* 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;
---
velocity-1.7/src/java/org/apache/velocity/runtime/parser/node/PropertyExecutor.java
2023-09-27 00:55:09.980274640 +0200
+++
velocity-1.7/src/java/org/apache/velocity/runtime/parser/node/PropertyExecutor.java
2023-09-27 00:55:44.027164066 +0200
@@ -21,7 +21,7 @@
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;
---
velocity-1.7/src/java/org/apache/velocity/runtime/parser/node/SetPropertyExecutor.java
2023-09-27 00:55:09.980274640 +0200
+++
velocity-1.7/src/java/org/apache/velocity/runtime/parser/node/SetPropertyExecutor.java
2023-09-27 00:55:44.030497422 +0200
@@ -21,8 +21,8 @@
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;
---
velocity-1.7/src/java/org/apache/velocity/runtime/parser/node/SimpleNode.java
2023-09-27 00:55:09.980274640 +0200
+++
velocity-1.7/src/java/org/apache/velocity/runtime/parser/node/SimpleNode.java
2023-09-27 00:55:44.030497422 +0200
@@ -22,8 +22,8 @@
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;
--- velocity-1.7/src/java/org/apache/velocity/runtime/parser/Parser.java
2023-09-27 00:55:09.976941285 +0200
+++ velocity-1.7/src/java/org/apache/velocity/runtime/parser/Parser.java
2023-09-27 00:55:44.027164066 +0200
@@ -10,7 +10,7 @@
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;
/**
---
velocity-1.7/src/java/org/apache/velocity/runtime/parser/ParserTokenManager.java
2023-09-27 00:55:09.976941285 +0200
+++
velocity-1.7/src/java/org/apache/velocity/runtime/parser/ParserTokenManager.java
2023-09-27 00:55:44.027164066 +0200
@@ -9,7 +9,7 @@
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. */
---
velocity-1.7/src/java/org/apache/velocity/runtime/resource/loader/ClasspathResourceLoader.java
2023-09-27 00:55:09.980274640 +0200
+++
velocity-1.7/src/java/org/apache/velocity/runtime/resource/loader/ClasspathResourceLoader.java
2023-09-27 00:55:44.030497422 +0200
@@ -22,7 +22,7 @@
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;
---
velocity-1.7/src/java/org/apache/velocity/runtime/resource/loader/DataSourceResourceLoader.java
2023-09-27 00:55:09.980274640 +0200
+++
velocity-1.7/src/java/org/apache/velocity/runtime/resource/loader/DataSourceResourceLoader.java
2023-09-27 00:55:44.030497422 +0200
@@ -218,7 +218,7 @@
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");
}
---
velocity-1.7/src/java/org/apache/velocity/runtime/resource/loader/FileResourceLoader.java
2023-09-27 00:55:09.980274640 +0200
+++
velocity-1.7/src/java/org/apache/velocity/runtime/resource/loader/FileResourceLoader.java
2023-09-27 00:55:44.030497422 +0200
@@ -118,7 +118,7 @@
/*
* 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
---
velocity-1.7/src/java/org/apache/velocity/runtime/resource/loader/JarResourceLoader.java
2023-09-27 00:55:09.980274640 +0200
+++
velocity-1.7/src/java/org/apache/velocity/runtime/resource/loader/JarResourceLoader.java
2023-09-27 00:55:44.030497422 +0200
@@ -195,7 +195,7 @@
{
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!");
}
---
velocity-1.7/src/java/org/apache/velocity/runtime/resource/loader/StringResourceLoader.java
2023-09-27 00:55:09.980274640 +0200
+++
velocity-1.7/src/java/org/apache/velocity/runtime/resource/loader/StringResourceLoader.java
2023-09-27 00:55:44.030497422 +0200
@@ -26,7 +26,7 @@
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;
---
velocity-1.7/src/java/org/apache/velocity/runtime/resource/loader/URLResourceLoader.java
2023-09-27 00:55:09.980274640 +0200
+++
velocity-1.7/src/java/org/apache/velocity/runtime/resource/loader/URLResourceLoader.java
2023-09-27 00:55:44.030497422 +0200
@@ -26,7 +26,7 @@
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;
---
velocity-1.7/src/java/org/apache/velocity/runtime/resource/ResourceManagerImpl.java
2023-09-27 00:55:09.980274640 +0200
+++
velocity-1.7/src/java/org/apache/velocity/runtime/resource/ResourceManagerImpl.java
2023-09-27 00:55:44.030497422 +0200
@@ -158,7 +158,7 @@
Object cacheObject = null;
- if (org.apache.commons.lang.StringUtils.isNotEmpty(cacheClassName))
+ if (org.apache.commons.lang3.StringUtils.isNotEmpty(cacheClassName))
{
try
{
@@ -534,7 +534,7 @@
* 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() +
--- velocity-1.7/src/java/org/apache/velocity/runtime/RuntimeInstance.java
2023-09-27 00:55:09.976941285 +0200
+++ velocity-1.7/src/java/org/apache/velocity/runtime/RuntimeInstance.java
2023-09-27 00:55:44.023830711 +0200
@@ -32,7 +32,7 @@
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;
--- velocity-1.7/src/java/org/apache/velocity/runtime/VelocimacroFactory.java
2023-09-27 00:55:09.976941285 +0200
+++ velocity-1.7/src/java/org/apache/velocity/runtime/VelocimacroFactory.java
2023-09-27 00:55:44.023830711 +0200
@@ -26,7 +26,7 @@
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;
--- velocity-1.7/src/java/org/apache/velocity/util/introspection/ClassMap.java
2023-09-27 00:55:09.980274640 +0200
+++ velocity-1.7/src/java/org/apache/velocity/util/introspection/ClassMap.java
2023-09-27 00:55:44.030497422 +0200
@@ -23,7 +23,7 @@
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;
---
velocity-1.7/src/test/org/apache/velocity/io/UnicodeInputStreamTestCase.java
2023-09-27 00:55:09.983607995 +0200
+++
velocity-1.7/src/test/org/apache/velocity/io/UnicodeInputStreamTestCase.java
2023-09-27 00:55:44.030497422 +0200
@@ -27,7 +27,7 @@
import junit.framework.TestCase;
import junit.framework.TestSuite;
-import org.apache.commons.lang.ArrayUtils;
+import org.apache.commons.lang3.ArrayUtils;
/**
--- velocity-1.7/src/test/org/apache/velocity/test/BaseTestCase.java
2023-09-27 00:55:09.983607995 +0200
+++ velocity-1.7/src/test/org/apache/velocity/test/BaseTestCase.java
2023-09-27 00:55:44.030497422 +0200
@@ -353,7 +353,7 @@
buf.append(baseFile.getPath());
}
- if (org.apache.commons.lang.StringUtils.isNotEmpty(ext))
+ if (org.apache.commons.lang3.StringUtils.isNotEmpty(ext))
{
buf.append('.').append(ext);
}
--- velocity-1.7/src/test/org/apache/velocity/test/MethodCacheKeyTestCase.java
2023-09-27 00:55:09.983607995 +0200
+++ velocity-1.7/src/test/org/apache/velocity/test/MethodCacheKeyTestCase.java
2023-09-27 00:55:44.030497422 +0200
@@ -21,7 +21,7 @@
import junit.framework.TestCase;
-import org.apache.commons.lang.ArrayUtils;
+import org.apache.commons.lang3.ArrayUtils;
import org.apache.velocity.runtime.parser.node.ASTMethod;
/**
++++++ velocity-1.7-log-chute.patch ++++++
---
velocity-1.7/src/java/org/apache/velocity/runtime/defaults/velocity.properties
2023-09-27 00:55:09.976941285 +0200
+++
velocity-1.7/src/java/org/apache/velocity/runtime/defaults/velocity.properties
2023-09-27 00:57:58.884707172 +0200
@@ -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.
