diff --git a/.gitignore b/.gitignore index fd91782..0025f3e 100644 --- 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 index b7476a7..01d26af 100644 --- a/pom.xml +++ b/pom.xml @@ -84,7 +84,7 @@ org.apache.velocity velocity-engine-core - 2.3 + 2.4 org.apache.commons diff --git a/src/main/java/org/mybatis/scripting/velocity/InDirective.java b/src/main/java/org/mybatis/scripting/velocity/InDirective.java index 73cf635..0d24760 100644 --- 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 index 8ca736c..a1236ca 100644 --- 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: