This is an automated email from the ASF dual-hosted git repository. mbrohl pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
The following commit(s) were added to refs/heads/trunk by this push: new 03b3a7b Improved: Upgrade Freemarker from 2.3.29 to 2.3.30. 03b3a7b is described below commit 03b3a7bc02891096a551fd4f1dfb17259a06a525 Author: Michael Brohl <mbr...@apache.org> AuthorDate: Sun Mar 8 01:13:05 2020 +0100 Improved: Upgrade Freemarker from 2.3.29 to 2.3.30. (OFBIZ-11445) --- build.gradle | 2 +- .../main/java/org/apache/ofbiz/base/util/template/FreeMarkerWorker.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index b4ffe8d..1488f35 100644 --- a/build.gradle +++ b/build.gradle @@ -188,7 +188,7 @@ dependencies { implementation 'org.apache.xmlrpc:xmlrpc-client:3.1.3' implementation 'org.apache.xmlrpc:xmlrpc-server:3.1.3' implementation 'org.codehaus.groovy:groovy-all:2.5.8' // Remember to change the version number in javadoc block - implementation 'org.freemarker:freemarker:2.3.29' // Remember to change the version number in FreeMarkerWorker class when upgrading. See OFBIZ-10019 if >= 2.4 + implementation 'org.freemarker:freemarker:2.3.30' // Remember to change the version number in FreeMarkerWorker class when upgrading. See OFBIZ-10019 if >= 2.4 implementation 'org.owasp.esapi:esapi:2.2.0.0' implementation 'org.springframework:spring-test:5.2.0.RELEASE' implementation 'org.zapodot:jackson-databind-java-optional:2.6.1' diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/template/FreeMarkerWorker.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/template/FreeMarkerWorker.java index 558ec48..d1a368b 100644 --- a/framework/base/src/main/java/org/apache/ofbiz/base/util/template/FreeMarkerWorker.java +++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/template/FreeMarkerWorker.java @@ -74,7 +74,7 @@ public final class FreeMarkerWorker { private static final String MODULE = FreeMarkerWorker.class.getName(); - public static final Version VERSION = Configuration.VERSION_2_3_29; + public static final Version VERSION = Configuration.VERSION_2_3_30; private FreeMarkerWorker() { }