Skip to content

Commit 5488fe4

Browse files
committed
CAY-2893 Update velocity-engine-core dependency
1 parent 0a6b6d1 commit 5488fe4

5 files changed

Lines changed: 20 additions & 3 deletions

File tree

RELEASE-NOTES.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ Date:
1414
Changes/New Features:
1515

1616
CAY-2884 Upgrade gradle to 8.13
17+
CAY-2893 Update velocity-engine-core dependency
1718

1819
Bug Fixes:
1920

cayenne-cgen/pom.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,11 @@
5353
<artifactId>velocity-engine-core</artifactId>
5454
<scope>compile</scope>
5555
</dependency>
56+
<dependency>
57+
<groupId>org.apache.commons</groupId>
58+
<artifactId>commons-lang3</artifactId>
59+
<scope>compile</scope>
60+
</dependency>
5661

5762
<dependency>
5863
<groupId>org.apache.velocity.tools</groupId>

cayenne-velocity/pom.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,11 @@
4545
<artifactId>velocity-engine-core</artifactId>
4646
<scope>compile</scope>
4747
</dependency>
48+
<dependency>
49+
<groupId>org.apache.commons</groupId>
50+
<artifactId>commons-lang3</artifactId>
51+
<scope>compile</scope>
52+
</dependency>
4853

4954
<!-- Test dependencies -->
5055
<dependency>

cayenne-velocity/src/main/java/org/apache/cayenne/velocity/VelocitySQLTemplateProcessor.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
import org.apache.velocity.runtime.parser.ParseException;
3434
import org.apache.velocity.runtime.parser.node.ASTReference;
3535
import org.apache.velocity.runtime.parser.node.SimpleNode;
36-
import org.apache.velocity.runtime.visitor.BaseVisitor;
36+
import org.apache.velocity.runtime.parser.node.StandardParserDefaultVisitor;
3737

3838
import java.io.StringReader;
3939
import java.io.StringWriter;
@@ -50,7 +50,7 @@
5050
*/
5151
public class VelocitySQLTemplateProcessor implements SQLTemplateProcessor {
5252

53-
private final class PositionalParamMapper extends BaseVisitor {
53+
private static final class PositionalParamMapper extends StandardParserDefaultVisitor {
5454

5555
private int i;
5656
private List<Object> positionalParams;

pom.xml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -404,7 +404,13 @@
404404
<dependency>
405405
<groupId>org.apache.velocity</groupId>
406406
<artifactId>velocity-engine-core</artifactId>
407-
<version>2.3</version>
407+
<version>2.4.1</version>
408+
</dependency>
409+
<!-- Need stable version for Velocity -->
410+
<dependency>
411+
<groupId>org.apache.commons</groupId>
412+
<artifactId>commons-lang3</artifactId>
413+
<version>3.18.0</version>
408414
</dependency>
409415
<dependency>
410416
<groupId>org.apache.velocity.tools</groupId>

0 commit comments

Comments
 (0)