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.gitThe following commit(s) were added to refs/heads/trunk by this push:
new 44922f0 Improved: Update Freemarker to 2.3.31
44922f0 is described below
commit 44922f0fbadda02fc823bddf4c00e6b2373810cf
Author: Jacques Le Roux <
[hidden email]>
AuthorDate: Thu Feb 18 13:35:53 2021 +0100
Improved: Update Freemarker to 2.3.31
---
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 abc1356..e62b1df 100644
--- a/build.gradle
+++ b/build.gradle
@@ -218,7 +218,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.11' // Compile issue with commons-cli and Groovy 3. Remember to change the version number in javadoc block.
- 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.freemarker:freemarker:2.3.31' // Remember to change the version number in FreeMarkerWorker class when upgrading. See OFBIZ-10019 if >= 2.4
implementation 'org.owasp.esapi:esapi:2.2.2.0'
implementation 'org.springframework:spring-test:5.3.2'
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 b241d92..83939d0 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
@@ -75,7 +75,7 @@ public final class FreeMarkerWorker {
private static final String MODULE = FreeMarkerWorker.class.getName();
- public static final Version VERSION = Configuration.VERSION_2_3_30;
+ public static final Version VERSION = Configuration.VERSION_2_3_31;
private FreeMarkerWorker() { }