This is an automated email from the ASF dual-hosted git repository. jleroux 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 bcda02adc7 Improved: Upgrade Freemarker from 2.3.31 to 2.3.32 (OFBIZ-12744) bcda02adc7 is described below commit bcda02adc767a611c565fcf45619dfda1b1aea11 Author: Jacques Le Roux <jacques.le.r...@les7arts.com> AuthorDate: Mon Jan 16 09:37:40 2023 +0100 Improved: Upgrade Freemarker from 2.3.31 to 2.3.32 (OFBIZ-12744) See https://freemarker.apache.org/docs/versions_2_3_32.html for details Thanks: Daniel Dekany for all the good work --- 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 92d23a125a..978ff6db59 100644 --- a/build.gradle +++ b/build.gradle @@ -256,7 +256,7 @@ dependencies { implementation 'org.apache.xmlrpc:xmlrpc-server:3.1.3' implementation 'org.clojure:clojure:1.11.1' implementation 'org.codehaus.groovy:groovy-all:3.0.13' - implementation 'org.freemarker:freemarker:2.3.31' // Remember to change the version number in FreeMarkerWorker class when upgrading. See OFBIZ-10019 if >= 2.4 + implementation 'org.freemarker:freemarker:2.3.32' // Remember to change the version number in FreeMarkerWorker class when upgrading. See OFBIZ-10019 if >= 2.4 implementation 'org.owasp.esapi:esapi:2.5.0.0' implementation 'org.cyberneko:html:1.9.8' implementation 'org.springframework:spring-test:5.3.23' 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 ec234d569b..be8ae93067 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 @@ -73,7 +73,7 @@ public final class FreeMarkerWorker { /** The template used to retrieved Freemarker transforms from multiple component classpaths. */ private static final String TRANSFORMS_PROPERTIES = "org/apache/ofbiz/%s/freemarkerTransforms.properties"; private static final String MODULE = FreeMarkerWorker.class.getName(); - public static final Version VERSION = Configuration.VERSION_2_3_31; + public static final Version VERSION = Configuration.VERSION_2_3_32; private FreeMarkerWorker() { }