Implemented: Upgrade to 2.3.33 FreeMarker release (OFBIZ-13113)

This follows OFBIZ-12935 after https://lists.apache.org/thread/bx41zsbyc8prccol8fkgpkqhsd3293so
apache · Jun 3, 2024 · 7b8f149 · 7b8f149
1 parent 56eecea
commit 7b8f149
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/dependencies.gradle b/dependencies.gradle
@@ -70,8 +70,7 @@ dependencies {
     implementation 'org.apache.xmlgraphics:fop:2.3' // NOTE: since 2.4 dependencies are messed up. See https://github.com/moqui/moqui-fop/blob/master/build.gradle
     implementation 'org.clojure:clojure:1.11.1'
     implementation 'org.codehaus.groovy:groovy-all:3.0.21'
-    //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.freemarker:freemarker:2.3.33-SNAPSHOT' // Remember to change the version number in FreeMarkerWorker class when upgrading. See OFBIZ-10019 if >= 2.4
+    implementation 'org.freemarker:freemarker:2.3.33' // Remember to change the version number in FreeMarkerWorker class when upgrading. See OFBIZ-10019 if >= 2.4
 
     implementation 'org.owasp.esapi:esapi:2.5.3.1'
     implementation 'org.cyberneko:html:1.9.8'

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
@@ -73,8 +73,6 @@ 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_32;
-    //public static final Version VERSION = Configuration.DEFAULT_INCOMPATIBLE_IMPROVEMENTS;
     public static final Version VERSION = Configuration.VERSION_2_3_33;
 
     private FreeMarkerWorker() { }