SLFO-pool/velocity
SHA256
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sync from SUSE:SLFO:Main velocity revision 715ac0bdcd83abc00185988860b1bf0b

Browse Source
This commit is contained in:
Adrian Schröter 2024-05-31 15:02:36 +02:00
parent fdcdffee7e
commit ebef1f4292
4 changed files with 269 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

328
velocity-1.7-commons-lang3.patch
View File

@ -1,20 +1,5 @@
--- velocity-1.7/pom.xml 2023-09-27 00:55:09.936941022 +0200 --- velocity-1.7/src/java/org/apache/velocity/app/event/implement/EscapeHtmlReference.java 2024-02-25 20:09:56.325990176 +0100
+++ velocity-1.7/pom.xml 2023-09-27 00:55:44.023830711 +0200 +++ velocity-1.7/src/java/org/apache/velocity/app/event/implement/EscapeHtmlReference.java 2024-02-25 20:10:38.639408321 +0100
@@ -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 @@ @@ -19,7 +19,7 @@
* under the License. * under the License.
*/ */
@ -33,8 +18,8 @@
} }
/** /**
--- 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 2024-02-25 20:09:56.325990176 +0100
+++ velocity-1.7/src/java/org/apache/velocity/app/event/implement/EscapeJavaScriptReference.java 2023-09-27 00:55:44.023830711 +0200 +++ velocity-1.7/src/java/org/apache/velocity/app/event/implement/EscapeJavaScriptReference.java 2024-02-25 20:10:38.639408321 +0100
@@ -19,7 +19,7 @@ @@ -19,7 +19,7 @@
* under the License. * under the License.
*/ */
@ -53,29 +38,29 @@
} }
/** /**
--- 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 2024-02-25 20:09:56.325990176 +0100
+++ velocity-1.7/src/java/org/apache/velocity/app/event/implement/EscapeSqlReference.java 2023-09-27 00:55:44.023830711 +0200 +++ velocity-1.7/src/java/org/apache/velocity/app/event/implement/EscapeSqlReference.java 2024-02-25 20:10:38.642741661 +0100
@@ -19,7 +19,7 @@ @@ -19,8 +19,6 @@
* under the License. * under the License.
*/ */
-import org.apache.commons.lang.StringEscapeUtils; -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. * Escapes the characters in a String to be suitable to pass to an SQL query.
@@ -39,7 +39,8 @@ * @see <a href="http://jakarta.apache.org/commons/lang/api/org/apache/commons/lang/StringEscapeUtils.html#escapeSql(java.lang.String)">StringEscapeUtils</a>
@@ -39,7 +37,8 @@
*/ */
protected String escape(Object text) protected String escape(Object text)
{ {
- return StringEscapeUtils.escapeSql(text.toString()); - 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) + // 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(), "'", "''"); + return text.toString().replaceAll("'", "''");
} }
/** /**
--- 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 2024-02-25 20:09:56.325990176 +0100
+++ velocity-1.7/src/java/org/apache/velocity/app/event/implement/EscapeXmlReference.java 2023-09-27 00:55:44.023830711 +0200 +++ velocity-1.7/src/java/org/apache/velocity/app/event/implement/EscapeXmlReference.java 2024-02-25 20:14:52.949919458 +0100
@@ -19,7 +19,7 @@ @@ -19,7 +19,7 @@
* under the License. * under the License.
*/ */
@ -85,30 +70,55 @@
/** /**
* Escape all XML entities. * Escape all XML entities.
--- velocity-1.7/src/java/org/apache/velocity/runtime/directive/Block.java 2023-09-27 00:55:09.976941285 +0200 @@ -39,7 +39,7 @@
+++ velocity-1.7/src/java/org/apache/velocity/runtime/directive/Block.java 2023-09-27 00:55:44.023830711 +0200 */
@@ -23,7 +23,7 @@ protected String escape(Object text)
{
- return StringEscapeUtils.escapeXml(text.toString());
+ return StringEscapeUtils.escapeXml10(text.toString());
}
/**
--- velocity-1.7/src/java/org/apache/velocity/runtime/directive/Block.java 2024-02-25 20:09:56.325990176 +0100
+++ velocity-1.7/src/java/org/apache/velocity/runtime/directive/Block.java 2024-02-25 20:19:30.850478725 +0100
@@ -23,7 +23,6 @@
import java.io.StringWriter; import java.io.StringWriter;
import java.io.Writer; import java.io.Writer;
-import org.apache.commons.lang.text.StrBuilder; -import org.apache.commons.lang.text.StrBuilder;
+import org.apache.commons.lang3.text.StrBuilder;
import org.apache.velocity.context.InternalContextAdapter; import org.apache.velocity.context.InternalContextAdapter;
import org.apache.velocity.exception.TemplateInitException; import org.apache.velocity.exception.TemplateInitException;
import org.apache.velocity.runtime.Renderable; 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 @@ -110,7 +109,7 @@
+++ velocity-1.7/src/java/org/apache/velocity/runtime/directive/RuntimeMacro.java 2023-09-27 00:55:44.027164066 +0200 */
@@ -23,7 +23,7 @@ protected String id(InternalContextAdapter context)
{
- StrBuilder str = new StrBuilder(100)
+ StringBuilder str = new StringBuilder(100)
.append("block $").append(key);
if (!context.getCurrentTemplateName().equals(getTemplateName()))
{
--- velocity-1.7/src/java/org/apache/velocity/runtime/directive/RuntimeMacro.java 2024-02-25 20:09:56.325990176 +0100
+++ velocity-1.7/src/java/org/apache/velocity/runtime/directive/RuntimeMacro.java 2024-02-25 20:59:50.755384801 +0100
@@ -23,7 +23,6 @@
import java.io.Writer; import java.io.Writer;
import java.util.List; import java.util.List;
-import org.apache.commons.lang.text.StrBuilder; -import org.apache.commons.lang.text.StrBuilder;
+import org.apache.commons.lang3.text.StrBuilder;
import org.apache.velocity.context.InternalContextAdapter; import org.apache.velocity.context.InternalContextAdapter;
import org.apache.velocity.exception.MethodInvocationException; import org.apache.velocity.exception.MethodInvocationException;
import org.apache.velocity.exception.ParseErrorException; 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 @@ -184,7 +183,7 @@
+++ velocity-1.7/src/java/org/apache/velocity/runtime/parser/node/ASTDirective.java 2023-09-27 00:55:44.027164066 +0200 {
if (literal == null)
{
- StrBuilder buffer = new StrBuilder();
+ StringBuilder buffer = new StringBuilder();
Token t = node.getFirstToken();
while (t != null && t != node.getLastToken())
--- velocity-1.7/src/java/org/apache/velocity/runtime/parser/node/ASTDirective.java 2024-02-25 20:09:56.329323516 +0100
+++ velocity-1.7/src/java/org/apache/velocity/runtime/parser/node/ASTDirective.java 2024-02-25 20:10:38.642741661 +0100
@@ -22,7 +22,7 @@ @@ -22,7 +22,7 @@
import java.io.IOException; import java.io.IOException;
import java.io.Writer; import java.io.Writer;
@ -118,8 +128,8 @@
import org.apache.velocity.context.InternalContextAdapter; import org.apache.velocity.context.InternalContextAdapter;
import org.apache.velocity.exception.MethodInvocationException; import org.apache.velocity.exception.MethodInvocationException;
import org.apache.velocity.exception.ParseErrorException; 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 2024-02-25 20:09:56.329323516 +0100
+++ velocity-1.7/src/java/org/apache/velocity/runtime/parser/node/ASTMethod.java 2023-09-27 00:55:44.027164066 +0200 +++ velocity-1.7/src/java/org/apache/velocity/runtime/parser/node/ASTMethod.java 2024-02-25 20:10:38.642741661 +0100
@@ -21,8 +21,8 @@ @@ -21,8 +21,8 @@
import java.lang.reflect.InvocationTargetException; import java.lang.reflect.InvocationTargetException;
@ -131,30 +141,97 @@
import org.apache.velocity.app.event.EventHandlerUtil; import org.apache.velocity.app.event.EventHandlerUtil;
import org.apache.velocity.context.InternalContextAdapter; import org.apache.velocity.context.InternalContextAdapter;
import org.apache.velocity.exception.MethodInvocationException; 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 2024-02-25 20:09:56.329323516 +0100
+++ velocity-1.7/src/java/org/apache/velocity/runtime/parser/node/ASTStringLiteral.java 2023-09-27 00:55:44.027164066 +0200 +++ velocity-1.7/src/java/org/apache/velocity/runtime/parser/node/ASTStringLiteral.java 2024-02-25 21:05:38.532745163 +0100
@@ -21,7 +21,7 @@ @@ -21,7 +21,6 @@
import java.io.StringReader; import java.io.StringReader;
import java.io.StringWriter; import java.io.StringWriter;
-import org.apache.commons.lang.text.StrBuilder; -import org.apache.commons.lang.text.StrBuilder;
+import org.apache.commons.lang3.text.StrBuilder;
import org.apache.velocity.context.InternalContextAdapter; import org.apache.velocity.context.InternalContextAdapter;
import org.apache.velocity.exception.TemplateInitException; import org.apache.velocity.exception.TemplateInitException;
import org.apache.velocity.exception.VelocityException; 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 @@ -227,14 +226,13 @@
+++ 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 @@ private String replaceQuotes(String s, char literalQuoteChar)
{
- if( (literalQuoteChar == '"' && s.indexOf("\"") == -1) ||
- (literalQuoteChar == '\'' && s.indexOf("'") == -1) )
+ if( (literalQuoteChar == '"' && !s.contains("\"")) ||
+ (literalQuoteChar == '\'' && !s.contains("'")) )
{
return s;
}
- StrBuilder result = new StrBuilder(s.length());
- char prev = ' ';
+ StringBuilder result = new StringBuilder(s.length());
for(int i = 0, is = s.length(); i < is; i++)
{
char c = s.charAt(i);
@@ -264,7 +262,7 @@
int u = string.indexOf("\\u");
if (u < 0) return string;
- StrBuilder result = new StrBuilder();
+ StringBuilder result = new StringBuilder();
int lastCopied = 0;
--- velocity-1.7/src/java/org/apache/velocity/runtime/parser/node/NodeUtils.java 2024-02-25 20:09:56.329323516 +0100
+++ velocity-1.7/src/java/org/apache/velocity/runtime/parser/node/NodeUtils.java 2024-02-25 21:11:08.083396305 +0100
@@ -19,7 +19,6 @@
* under the License. * under the License.
*/ */
-import org.apache.commons.lang.text.StrBuilder; -import org.apache.commons.lang.text.StrBuilder;
+import org.apache.commons.lang3.text.StrBuilder;
import org.apache.velocity.context.Context; import org.apache.velocity.context.Context;
import org.apache.velocity.exception.MethodInvocationException; import org.apache.velocity.exception.MethodInvocationException;
import org.apache.velocity.runtime.parser.ParserConstants; 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 @@ -55,11 +54,11 @@
+++ velocity-1.7/src/java/org/apache/velocity/runtime/parser/node/PropertyExecutor.java 2023-09-27 00:55:44.027164066 +0200 * special tokens, this is simply a way to
* extract them.
* @param t the Token
- * @return StrBuilder with the special tokens.
+ * @return StringBuilder with the special tokens.
*/
- public static StrBuilder getSpecialText(Token t)
+ public static StringBuilder getSpecialText(Token t)
{
- StrBuilder sb = new StrBuilder();
+ StringBuilder sb = new StringBuilder();
Token tmp_t = t.specialToken;
@@ -153,7 +152,7 @@
}
else
{
- StrBuilder special = getSpecialText(t);
+ StringBuilder special = getSpecialText(t);
if (special.length() > 0)
{
return special.append(t.image).toString();
@@ -187,7 +186,7 @@
if( argStr.indexOf('$') == -1 )
return argStr;
- StrBuilder argBuf = new StrBuilder();
+ StringBuilder argBuf = new StringBuilder();
for (int cIdx = 0, is = argStr.length(); cIdx < is;)
{
@@ -195,7 +194,7 @@
if( ch == '$' )
{
- StrBuilder nameBuf = new StrBuilder();
+ StringBuilder nameBuf = new StringBuilder();
for (++cIdx ; cIdx < is; ++cIdx)
{
ch = argStr.charAt(cIdx);
--- velocity-1.7/src/java/org/apache/velocity/runtime/parser/node/PropertyExecutor.java 2024-02-25 20:09:56.329323516 +0100
+++ velocity-1.7/src/java/org/apache/velocity/runtime/parser/node/PropertyExecutor.java 2024-02-25 20:10:38.646075001 +0100
@@ -21,7 +21,7 @@ @@ -21,7 +21,7 @@
import java.lang.reflect.InvocationTargetException; import java.lang.reflect.InvocationTargetException;
@ -164,56 +241,90 @@
import org.apache.velocity.exception.VelocityException; import org.apache.velocity.exception.VelocityException;
import org.apache.velocity.runtime.RuntimeLogger; import org.apache.velocity.runtime.RuntimeLogger;
import org.apache.velocity.runtime.log.Log; 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 2024-02-25 20:09:56.329323516 +0100
+++ velocity-1.7/src/java/org/apache/velocity/runtime/parser/node/SetPropertyExecutor.java 2023-09-27 00:55:44.030497422 +0200 +++ velocity-1.7/src/java/org/apache/velocity/runtime/parser/node/SetPropertyExecutor.java 2024-02-25 21:13:00.260284591 +0100
@@ -21,8 +21,8 @@ @@ -21,8 +21,7 @@
import java.lang.reflect.InvocationTargetException; import java.lang.reflect.InvocationTargetException;
-import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.StringUtils;
-import org.apache.commons.lang.text.StrBuilder; -import org.apache.commons.lang.text.StrBuilder;
+import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.text.StrBuilder;
import org.apache.velocity.exception.VelocityException; import org.apache.velocity.exception.VelocityException;
import org.apache.velocity.runtime.log.Log; import org.apache.velocity.runtime.log.Log;
import org.apache.velocity.util.introspection.Introspector; 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 @@ -81,7 +80,7 @@
+++ 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 @@ try
{
- StrBuilder sb = new StrBuilder("set");
+ StringBuilder sb = new StringBuilder("set");
sb.append(property);
setMethod(introspector.getMethod(clazz, sb.toString(), params));
--- velocity-1.7/src/java/org/apache/velocity/runtime/parser/node/SimpleNode.java 2024-02-25 20:09:56.329323516 +0100
+++ velocity-1.7/src/java/org/apache/velocity/runtime/parser/node/SimpleNode.java 2024-02-25 21:14:08.087085246 +0100
@@ -22,8 +22,7 @@
import java.io.IOException; import java.io.IOException;
import java.io.Writer; import java.io.Writer;
-import org.apache.commons.lang.builder.ToStringBuilder; -import org.apache.commons.lang.builder.ToStringBuilder;
-import org.apache.commons.lang.text.StrBuilder; -import org.apache.commons.lang.text.StrBuilder;
+import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.text.StrBuilder;
import org.apache.velocity.context.InternalContextAdapter; import org.apache.velocity.context.InternalContextAdapter;
import org.apache.velocity.exception.MethodInvocationException; import org.apache.velocity.exception.MethodInvocationException;
import org.apache.velocity.exception.ParseErrorException; 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 @@ -280,7 +279,7 @@
+++ velocity-1.7/src/java/org/apache/velocity/runtime/parser/Parser.java 2023-09-27 00:55:44.027164066 +0200 }
@@ -10,7 +10,7 @@
Token t = first;
- StrBuilder sb = new StrBuilder(NodeUtils.tokenLiteral(t));
+ StringBuilder sb = new StringBuilder(NodeUtils.tokenLiteral(t));
while (t != last)
{
t = t.next;
@@ -414,7 +413,7 @@
*/
public String toString()
{
- StrBuilder tokens = new StrBuilder();
+ StringBuilder tokens = new StringBuilder();
for (Token t = getFirstToken(); t != null; )
{
--- velocity-1.7/src/java/org/apache/velocity/runtime/parser/Parser.java 2024-02-25 20:09:56.329323516 +0100
+++ velocity-1.7/src/java/org/apache/velocity/runtime/parser/Parser.java 2024-02-25 21:14:59.367186560 +0100
@@ -10,7 +10,6 @@
import org.apache.velocity.runtime.directive.Macro; import org.apache.velocity.runtime.directive.Macro;
import org.apache.velocity.runtime.directive.MacroParseException; import org.apache.velocity.runtime.directive.MacroParseException;
import org.apache.velocity.util.StringUtils; import org.apache.velocity.util.StringUtils;
-import org.apache.commons.lang.text.StrBuilder; -import org.apache.commons.lang.text.StrBuilder;
+import org.apache.commons.lang3.text.StrBuilder;
import org.apache.velocity.runtime.RuntimeConstants; 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 2024-02-25 20:09:56.329323516 +0100
+++ velocity-1.7/src/java/org/apache/velocity/runtime/parser/ParserTokenManager.java 2023-09-27 00:55:44.027164066 +0200 +++ velocity-1.7/src/java/org/apache/velocity/runtime/parser/ParserTokenManager.java 2024-02-25 21:15:47.777282210 +0100
@@ -9,7 +9,7 @@ @@ -9,7 +9,6 @@
import org.apache.velocity.runtime.directive.Macro; import org.apache.velocity.runtime.directive.Macro;
import org.apache.velocity.runtime.directive.MacroParseException; import org.apache.velocity.runtime.directive.MacroParseException;
import org.apache.velocity.util.StringUtils; import org.apache.velocity.util.StringUtils;
-import org.apache.commons.lang.text.StrBuilder; -import org.apache.commons.lang.text.StrBuilder;
+import org.apache.commons.lang3.text.StrBuilder;
import org.apache.velocity.runtime.RuntimeConstants; import org.apache.velocity.runtime.RuntimeConstants;
/** Token Manager. */ /** Token Manager. */
--- velocity-1.7/src/java/org/apache/velocity/runtime/resource/loader/ClasspathResourceLoader.java 2023-09-27 00:55:09.980274640 +0200 @@ -5158,8 +5157,8 @@
+++ velocity-1.7/src/java/org/apache/velocity/runtime/resource/loader/ClasspathResourceLoader.java 2023-09-27 00:55:44.030497422 +0200 protected CharStream input_stream;
private final int[] jjrounds = new int[105];
private final int[] jjstateSet = new int[210];
-private final StrBuilder jjimage = new StrBuilder();
-private StrBuilder image = jjimage;
+private final StringBuilder jjimage = new StringBuilder();
+private StringBuilder image = jjimage;
private int jjimageLen;
private int lengthOfMatch;
protected char curChar;
--- velocity-1.7/src/java/org/apache/velocity/runtime/resource/loader/ClasspathResourceLoader.java 2024-02-25 20:09:56.329323516 +0100
+++ velocity-1.7/src/java/org/apache/velocity/runtime/resource/loader/ClasspathResourceLoader.java 2024-02-25 20:10:38.646075001 +0100
@@ -22,7 +22,7 @@ @@ -22,7 +22,7 @@
import java.io.InputStream; import java.io.InputStream;
@ -223,8 +334,8 @@
import org.apache.velocity.exception.ResourceNotFoundException; import org.apache.velocity.exception.ResourceNotFoundException;
import org.apache.velocity.runtime.resource.Resource; import org.apache.velocity.runtime.resource.Resource;
import org.apache.velocity.util.ClassUtils; 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 2024-02-25 20:09:56.329323516 +0100
+++ velocity-1.7/src/java/org/apache/velocity/runtime/resource/loader/DataSourceResourceLoader.java 2023-09-27 00:55:44.030497422 +0200 +++ velocity-1.7/src/java/org/apache/velocity/runtime/resource/loader/DataSourceResourceLoader.java 2024-02-25 20:10:38.646075001 +0100
@@ -218,7 +218,7 @@ @@ -218,7 +218,7 @@
public synchronized InputStream getResourceStream(final String name) public synchronized InputStream getResourceStream(final String name)
throws ResourceNotFoundException throws ResourceNotFoundException
@ -234,8 +345,8 @@
{ {
throw new ResourceNotFoundException("DataSourceResourceLoader: Template name was empty or null"); 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 2024-02-25 20:09:56.329323516 +0100
+++ velocity-1.7/src/java/org/apache/velocity/runtime/resource/loader/FileResourceLoader.java 2023-09-27 00:55:44.030497422 +0200 +++ velocity-1.7/src/java/org/apache/velocity/runtime/resource/loader/FileResourceLoader.java 2024-02-25 20:10:38.646075001 +0100
@@ -118,7 +118,7 @@ @@ -118,7 +118,7 @@
/* /*
* Make sure we have a valid templateName. * Make sure we have a valid templateName.
@ -245,8 +356,8 @@
{ {
/* /*
* If we don't get a properly formed templateName then * 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 2024-02-25 20:09:56.329323516 +0100
+++ velocity-1.7/src/java/org/apache/velocity/runtime/resource/loader/JarResourceLoader.java 2023-09-27 00:55:44.030497422 +0200 +++ velocity-1.7/src/java/org/apache/velocity/runtime/resource/loader/JarResourceLoader.java 2024-02-25 20:10:38.646075001 +0100
@@ -195,7 +195,7 @@ @@ -195,7 +195,7 @@
{ {
InputStream results = null; InputStream results = null;
@ -256,8 +367,8 @@
{ {
throw new ResourceNotFoundException("Need to have a resource!"); 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 2024-02-25 20:09:56.329323516 +0100
+++ velocity-1.7/src/java/org/apache/velocity/runtime/resource/loader/StringResourceLoader.java 2023-09-27 00:55:44.030497422 +0200 +++ velocity-1.7/src/java/org/apache/velocity/runtime/resource/loader/StringResourceLoader.java 2024-02-25 20:10:38.646075001 +0100
@@ -26,7 +26,7 @@ @@ -26,7 +26,7 @@
import java.io.InputStream; import java.io.InputStream;
import java.io.UnsupportedEncodingException; import java.io.UnsupportedEncodingException;
@ -267,8 +378,8 @@
import org.apache.velocity.exception.ResourceNotFoundException; import org.apache.velocity.exception.ResourceNotFoundException;
import org.apache.velocity.exception.VelocityException; import org.apache.velocity.exception.VelocityException;
import org.apache.velocity.runtime.resource.Resource; 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 2024-02-25 20:09:56.329323516 +0100
+++ velocity-1.7/src/java/org/apache/velocity/runtime/resource/loader/URLResourceLoader.java 2023-09-27 00:55:44.030497422 +0200 +++ velocity-1.7/src/java/org/apache/velocity/runtime/resource/loader/URLResourceLoader.java 2024-02-25 20:10:38.646075001 +0100
@@ -26,7 +26,7 @@ @@ -26,7 +26,7 @@
import java.net.URLConnection; import java.net.URLConnection;
import java.util.HashMap; import java.util.HashMap;
@ -278,8 +389,8 @@
import org.apache.velocity.exception.VelocityException; import org.apache.velocity.exception.VelocityException;
import org.apache.velocity.exception.ResourceNotFoundException; import org.apache.velocity.exception.ResourceNotFoundException;
import org.apache.velocity.runtime.resource.Resource; 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 2024-02-25 20:09:56.329323516 +0100
+++ velocity-1.7/src/java/org/apache/velocity/runtime/resource/ResourceManagerImpl.java 2023-09-27 00:55:44.030497422 +0200 +++ velocity-1.7/src/java/org/apache/velocity/runtime/resource/ResourceManagerImpl.java 2024-02-25 20:10:38.646075001 +0100
@@ -158,7 +158,7 @@ @@ -158,7 +158,7 @@
Object cacheObject = null; Object cacheObject = null;
@ -298,19 +409,27 @@
{ {
log.warn("Declared encoding for template '" + log.warn("Declared encoding for template '" +
resource.getName() + 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 2024-02-25 20:09:56.329323516 +0100
+++ velocity-1.7/src/java/org/apache/velocity/runtime/RuntimeInstance.java 2023-09-27 00:55:44.023830711 +0200 +++ velocity-1.7/src/java/org/apache/velocity/runtime/RuntimeInstance.java 2024-02-25 21:17:20.747465879 +0100
@@ -32,7 +32,7 @@ @@ -32,7 +32,6 @@
import java.util.Properties; import java.util.Properties;
import org.apache.commons.collections.ExtendedProperties; import org.apache.commons.collections.ExtendedProperties;
-import org.apache.commons.lang.text.StrBuilder; -import org.apache.commons.lang.text.StrBuilder;
+import org.apache.commons.lang3.text.StrBuilder;
import org.apache.velocity.Template; import org.apache.velocity.Template;
import org.apache.velocity.app.event.EventCartridge; import org.apache.velocity.app.event.EventCartridge;
import org.apache.velocity.app.event.EventHandler; 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 @@ -1469,7 +1468,7 @@
+++ velocity-1.7/src/java/org/apache/velocity/runtime/VelocimacroFactory.java 2023-09-27 00:55:44.023830711 +0200 }
/* now just create the VM call, and use evaluate */
- StrBuilder template = new StrBuilder("#");
+ StringBuilder template = new StringBuilder("#");
template.append(vmName);
template.append("(");
for( int i = 0; i < params.length; i++)
--- velocity-1.7/src/java/org/apache/velocity/runtime/VelocimacroFactory.java 2024-02-25 20:09:56.332656856 +0100
+++ velocity-1.7/src/java/org/apache/velocity/runtime/VelocimacroFactory.java 2024-02-25 20:10:38.646075001 +0100
@@ -26,7 +26,7 @@ @@ -26,7 +26,7 @@
import java.util.Vector; import java.util.Vector;
import java.util.ArrayList; import java.util.ArrayList;
@ -320,19 +439,36 @@
import org.apache.velocity.Template; import org.apache.velocity.Template;
import org.apache.velocity.exception.VelocityException; import org.apache.velocity.exception.VelocityException;
import org.apache.velocity.runtime.directive.Directive; 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 2024-02-25 20:09:56.332656856 +0100
+++ velocity-1.7/src/java/org/apache/velocity/util/introspection/ClassMap.java 2023-09-27 00:55:44.030497422 +0200 +++ velocity-1.7/src/java/org/apache/velocity/util/introspection/ClassMap.java 2024-02-25 21:20:43.131199017 +0100
@@ -23,7 +23,7 @@ @@ -23,7 +23,6 @@
import java.lang.reflect.Modifier; import java.lang.reflect.Modifier;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
-import org.apache.commons.lang.text.StrBuilder; -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.runtime.log.Log;
import org.apache.velocity.util.MapFactory; 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 @@ -314,7 +313,7 @@
+++ velocity-1.7/src/test/org/apache/velocity/io/UnicodeInputStreamTestCase.java 2023-09-27 00:55:44.030497422 +0200 return method.getName();
}
- StrBuilder methodKey = new StrBuilder((args+1)*16).append(method.getName());
+ StringBuilder methodKey = new StringBuilder((args+1)*16).append(method.getName());
for (int j = 0; j < args; j++)
{
@@ -349,7 +348,7 @@
return method;
}
- StrBuilder methodKey = new StrBuilder((args+1)*16).append(method);
+ StringBuilder methodKey = new StringBuilder((args+1)*16).append(method);
for (int j = 0; j < args; j++)
{
--- velocity-1.7/src/test/org/apache/velocity/io/UnicodeInputStreamTestCase.java 2024-02-25 20:09:56.332656856 +0100
+++ velocity-1.7/src/test/org/apache/velocity/io/UnicodeInputStreamTestCase.java 2024-02-25 20:10:38.649408341 +0100
@@ -27,7 +27,7 @@ @@ -27,7 +27,7 @@
import junit.framework.TestCase; import junit.framework.TestCase;
import junit.framework.TestSuite; import junit.framework.TestSuite;
@ -342,8 +478,8 @@
/** /**
--- 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 2024-02-25 20:09:56.335990196 +0100
+++ velocity-1.7/src/test/org/apache/velocity/test/BaseTestCase.java 2023-09-27 00:55:44.030497422 +0200 +++ velocity-1.7/src/test/org/apache/velocity/test/BaseTestCase.java 2024-02-25 20:10:38.649408341 +0100
@@ -353,7 +353,7 @@ @@ -353,7 +353,7 @@
buf.append(baseFile.getPath()); buf.append(baseFile.getPath());
} }
@ -353,8 +489,8 @@
{ {
buf.append('.').append(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 2024-02-25 20:09:56.335990196 +0100
+++ velocity-1.7/src/test/org/apache/velocity/test/MethodCacheKeyTestCase.java 2023-09-27 00:55:44.030497422 +0200 +++ velocity-1.7/src/test/org/apache/velocity/test/MethodCacheKeyTestCase.java 2024-02-25 20:10:38.649408341 +0100
@@ -21,7 +21,7 @@ @@ -21,7 +21,7 @@
import junit.framework.TestCase; import junit.framework.TestCase;

14
velocity-build_xml.patch
View File

@ -1,6 +1,6 @@
--- build/build.xml.sav 2007-08-25 16:17:48.000000000 +0200 --- build/build.xml 2024-02-25 20:09:56.345990216 +0100
+++ build/build.xml 2007-08-25 16:18:14.000000000 +0200 +++ build/build.xml 2024-02-25 21:25:06.651720006 +0100
@@ -139,7 +139,9 @@ @@ -141,7 +141,9 @@
<!-- sets up the build environment (classpath and libs) --> <!-- sets up the build environment (classpath and libs) -->
<!-- =================================================================== --> <!-- =================================================================== -->
<target name="build-prepare"> <target name="build-prepare">
@ -10,3 +10,11 @@
<!-- Build classpath --> <!-- Build classpath -->
<path id="velocity.build.classpath"> <path id="velocity.build.classpath">
@@ -255,6 +257,7 @@
encoding="UTF-8"
debug="${debug}"
target="${javac.target}"
+ release="${javac.release}"
source="${javac.source}"
deprecation="${deprecation}"
optimize="${optimize}"

16
velocity.changes
View File

@ -1,3 +1,19 @@
-------------------------------------------------------------------
Thu May 16 14:27:57 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
- Use %patch -P N instead of deprecated %patchN.
-------------------------------------------------------------------
Tue Feb 27 15:50:04 UTC 2024 - Fridrich Strba <fstrba@suse.com>
- Modified patches:
* velocity-1.7-commons-lang3.patch
+ Use Java 8+ APIs instead of commons-lang3 ones whenever it is
possible, i.e. StringBuilder instead of StrBuilder
* velocity-build_xml.patch
+ In order to achieve Java 8 API compatibility, specify release
8 in ant build whenever it is possible
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Sep 27 04:36:41 UTC 2023 - Fridrich Strba <fstrba@suse.com> Wed Sep 27 04:36:41 UTC 2023 - Fridrich Strba <fstrba@suse.com>

16
velocity.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package velocity # spec file for package velocity
# #
# Copyright (c) 2023 SUSE LLC # Copyright (c) 2024 SUSE LLC
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -137,10 +137,14 @@ applications to be developed according to a true MVC model.
%prep %prep
%setup -q %setup -q
cp %{SOURCE1} pom.xml cp %{SOURCE1} pom.xml
%patch0 -b .sav0 %patch -P 0 -b .sav0
%patch1 -p1 %patch -P 1 -p1
%patch2 -p1
%patch3 -p1 # Use apache-commons-lang3
%pom_change_dep commons-lang:commons-lang org.apache.commons:commons-lang3:3.9
%patch -P 2 -p1
%patch -P 3 -p1
find . -name '*.jar' -print -delete find . -name '*.jar' -print -delete
find . -name '*.class' -print -delete find . -name '*.class' -print -delete
@ -169,7 +173,7 @@ build-jar-repository -s -p bin/lib commons-collections commons-lang3
export CLASSPATH=$(build-classpath commons-collections commons-lang3) export CLASSPATH=$(build-classpath commons-collections commons-lang3)
ant \ ant \
-Djavac.source=1.8 -Djavac.target=1.8 \ -Djavac.source=1.8 -Djavac.target=1.8 -Djavac.release=8 \
-buildfile build/build.xml \ -buildfile build/build.xml \
jar javadocs jar javadocs