[ofbiz-framework] branch release17.12 updated: Improved: Update Freemaker to 2.3.31 in R17 and R18 (OFBIZ-12196)

This is an automated email from the ASF dual-hosted git repository.

jleroux pushed a commit to branch release17.12
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git


The following commit(s) were added to refs/heads/release17.12 by this push:
     new ac1595b  Improved: Update Freemaker to 2.3.31 in R17 and  R18 (OFBIZ-12196)
ac1595b is described below

commit ac1595b304d9a6ca4df779b96851444f2b5ed555
Author: Jacques Le Roux <[hidden email]>
AuthorDate: Mon Mar 22 11:08:54 2021 +0100

    Improved: Update Freemaker to 2.3.31 in R17 and  R18 (OFBIZ-12196)
   
    That's for (low) security reason. There are no bugs in R17 and R18 but after
    reading about FREEMARKER-124 at
    https://freemarker.apache.org/docs/versions_2_3_30.html
    I believe we should update update Freemaker to 2.3.31 in R17 and R18
---
 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 56a7cc9..16e7f8b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -183,7 +183,7 @@ dependencies {
     compile 'org.apache.xmlrpc:xmlrpc-client:3.1.3'
     compile 'org.apache.xmlrpc:xmlrpc-server:3.1.3'
     compile 'org.codehaus.groovy:groovy-all:2.4.13' // Remember to change the version number in javadoc.options block
-    compile 'org.freemarker:freemarker:2.3.28' // Remember to change the version number in FreeMarkerWorker class when upgrading
+    compile 'org.freemarker:freemarker:2.3.31' // Remember to change the version number in FreeMarkerWorker class when upgrading
     compile 'org.hamcrest:hamcrest-all:1.3'
     compile 'org.owasp.esapi:esapi:2.1.0.1'
     compile 'org.springframework:spring-test:5.0.2.RELEASE'
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 f6b7222..ff051bd 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
@@ -71,7 +71,7 @@ public final class FreeMarkerWorker {
 
     public static final String module = FreeMarkerWorker.class.getName();
 
-    public static final Version version = Configuration.VERSION_2_3_28;
+    public static final Version version = Configuration.VERSION_2_3_31;
 
     private FreeMarkerWorker () {}