[ofbiz-framework] 02/02: Improved: Update Freemaker to 2.3.31 in R17 and R18 (OFBIZ-12196)

[jleroux]

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

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

commit e2c8ca6c4819c8d3fbaba56aef36a39b17838aaf
Author: Jacques Le Roux <jacques.le.r...@les7arts.com>
AuthorDate: Mon Mar 22 11:06:32 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 70ac47a..f5366e8 100644
--- a/build.gradle
+++ b/build.gradle
@@ -209,7 +209,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.1.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 f377e05..931f8a81 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 () {}