This is an automated email from the ASF dual-hosted git repository.
ntimofeev pushed a commit to branch STABLE-4.2
in repository https://gitbox.apache.org/repos/asf/cayenne.git
The following commit(s) were added to refs/heads/STABLE-4.2 by this push:
new 5488fe4e9 CAY-2893 Update `velocity-engine-core` dependency
5488fe4e9 is described below
commit 5488fe4e93c3f22dbb079e2ee703afb01d288dfb
Author: Nikita Timofeev <[email protected]>
AuthorDate: Wed Aug 27 17:43:00 2025 +0300
CAY-2893 Update `velocity-engine-core` dependency
---
RELEASE-NOTES.txt | 1 +
cayenne-cgen/pom.xml | 5 +++++
cayenne-velocity/pom.xml | 5 +++++
.../org/apache/cayenne/velocity/VelocitySQLTemplateProcessor.java | 4 ++--
pom.xml | 8 +++++++-
5 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index fa56a29ce..a8cb56526 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -14,6 +14,7 @@ Date:
Changes/New Features:
CAY-2884 Upgrade gradle to 8.13
+CAY-2893 Update velocity-engine-core dependency
Bug Fixes:
diff --git a/cayenne-cgen/pom.xml b/cayenne-cgen/pom.xml
index 578467d78..7b004ae67 100644
--- a/cayenne-cgen/pom.xml
+++ b/cayenne-cgen/pom.xml
@@ -53,6 +53,11 @@
<artifactId>velocity-engine-core</artifactId>
<scope>compile</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ <scope>compile</scope>
+ </dependency>
<dependency>
<groupId>org.apache.velocity.tools</groupId>
diff --git a/cayenne-velocity/pom.xml b/cayenne-velocity/pom.xml
index e7e3e68cf..6de5debc8 100644
--- a/cayenne-velocity/pom.xml
+++ b/cayenne-velocity/pom.xml
@@ -45,6 +45,11 @@
<artifactId>velocity-engine-core</artifactId>
<scope>compile</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ <scope>compile</scope>
+ </dependency>
<!-- Test dependencies -->
<dependency>
diff --git
a/cayenne-velocity/src/main/java/org/apache/cayenne/velocity/VelocitySQLTemplateProcessor.java
b/cayenne-velocity/src/main/java/org/apache/cayenne/velocity/VelocitySQLTemplateProcessor.java
index 4148f4ee9..c6b34bd10 100644
---
a/cayenne-velocity/src/main/java/org/apache/cayenne/velocity/VelocitySQLTemplateProcessor.java
+++
b/cayenne-velocity/src/main/java/org/apache/cayenne/velocity/VelocitySQLTemplateProcessor.java
@@ -33,7 +33,7 @@ import org.apache.velocity.runtime.RuntimeInstance;
import org.apache.velocity.runtime.parser.ParseException;
import org.apache.velocity.runtime.parser.node.ASTReference;
import org.apache.velocity.runtime.parser.node.SimpleNode;
-import org.apache.velocity.runtime.visitor.BaseVisitor;
+import org.apache.velocity.runtime.parser.node.StandardParserDefaultVisitor;
import java.io.StringReader;
import java.io.StringWriter;
@@ -50,7 +50,7 @@ import java.util.Map;
*/
public class VelocitySQLTemplateProcessor implements SQLTemplateProcessor {
- private final class PositionalParamMapper extends BaseVisitor {
+ private static final class PositionalParamMapper extends
StandardParserDefaultVisitor {
private int i;
private List<Object> positionalParams;
diff --git a/pom.xml b/pom.xml
index 172b91768..c9ef955ae 100644
--- a/pom.xml
+++ b/pom.xml
@@ -404,7 +404,13 @@
<dependency>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity-engine-core</artifactId>
- <version>2.3</version>
+ <version>2.4.1</version>
+ </dependency>
+ <!-- Need stable version for Velocity -->
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ <version>3.18.0</version>
</dependency>
<dependency>
<groupId>org.apache.velocity.tools</groupId>
