Merge pull request #234 from hazendaz/master

Move to velocity 2.4
mybatis · Sep 25, 2024 · ddad505 · ddad505
2 parents d7fdbbc + a3905bd
commit ddad505
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 9 deletions.
diff --git a/.gitignore b/.gitignore
@@ -7,3 +7,5 @@
 .idea
 *.iml
 .github/keys/
+release.properties
+pom.xml.releaseBackup
diff --git a/pom.xml b/pom.xml
@@ -84,7 +84,7 @@
     <dependency>
       <groupId>org.apache.velocity</groupId>
       <artifactId>velocity-engine-core</artifactId>
-      <version>2.3</version>
+      <version>2.4</version>
     </dependency>
     <dependency>
       <groupId>org.apache.commons</groupId>

diff --git a/src/main/java/org/mybatis/scripting/velocity/InDirective.java b/src/main/java/org/mybatis/scripting/velocity/InDirective.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2012-2022 the original author or authors.
+ *    Copyright 2012-2024 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -28,7 +28,7 @@
 import org.apache.velocity.runtime.parser.node.ASTReference;
 import org.apache.velocity.runtime.parser.node.ASTStringLiteral;
 import org.apache.velocity.runtime.parser.node.Node;
-import org.apache.velocity.runtime.parser.node.ParserTreeConstants;
+import org.apache.velocity.runtime.parser.node.StandardParserTreeConstants;
 import org.apache.velocity.util.introspection.Info;
 
 /**
@@ -61,12 +61,12 @@ public void init(RuntimeServices rs, InternalContextAdapter context, Node node)
     for (int i = 1; i < n; i++) {
       Node child = node.jjtGetChild(i);
       if (i == 1) {
-        if (child.getType() == ParserTreeConstants.JJTREFERENCE) {
+        if (child.getType() == StandardParserTreeConstants.JJTREFERENCE) {
           this.var = ((ASTReference) child).getRootString();
         } else {
           throw new TemplateInitException("Syntax error", getTemplateName(), getLine(), getColumn());
         }
-      } else if (child.getType() == ParserTreeConstants.JJTSTRINGLITERAL) {
+      } else if (child.getType() == StandardParserTreeConstants.JJTSTRINGLITERAL) {
         String value = (String) ((ASTStringLiteral) child).value(context);
         if (i == 2) {
           this.column = value;

diff --git a/src/main/java/org/mybatis/scripting/velocity/RepeatDirective.java b/src/main/java/org/mybatis/scripting/velocity/RepeatDirective.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2012-2022 the original author or authors.
+ *    Copyright 2012-2024 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -31,7 +31,7 @@
 import org.apache.velocity.runtime.parser.node.ASTReference;
 import org.apache.velocity.runtime.parser.node.ASTStringLiteral;
 import org.apache.velocity.runtime.parser.node.Node;
-import org.apache.velocity.runtime.parser.node.ParserTreeConstants;
+import org.apache.velocity.runtime.parser.node.StandardParserTreeConstants;
 import org.apache.velocity.util.introspection.Info;
 
 /**
@@ -60,12 +60,12 @@ public void init(RuntimeServices rs, InternalContextAdapter context, Node node)
     for (int i = 1; i < n; i++) {
       Node child = node.jjtGetChild(i);
       if (i == 1) {
-        if (child.getType() == ParserTreeConstants.JJTREFERENCE) {
+        if (child.getType() == StandardParserTreeConstants.JJTREFERENCE) {
           this.var = ((ASTReference) child).getRootString();
         } else {
           throw new TemplateInitException("Syntax error", getTemplateName(), getLine(), getColumn());
         }
-      } else if (child.getType() == ParserTreeConstants.JJTSTRINGLITERAL) {
+      } else if (child.getType() == StandardParserTreeConstants.JJTSTRINGLITERAL) {
         String value = (String) ((ASTStringLiteral) child).value(context);
         switch (i) {
           case 2: