(ofbiz-framework) branch trunk updated: Improved: Test 2.3.34 FreeMarker release (OFBIZ-13131)

[jleroux]

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 9d43c4dd5e Improved: Test 2.3.34 FreeMarker release (OFBIZ-13131)
9d43c4dd5e is described below

commit 9d43c4dd5e120fee121e28d5006af3966946eaf7
Author: Jacques Le Roux <jacques.le.r...@les7arts.com>
AuthorDate: Wed Aug 21 10:16:45 2024 +0200

    Improved: Test 2.3.34 FreeMarker release (OFBIZ-13131)
    
    All sounds OK (all tests included), so let's put it in trunk demo and see 
what
    happens
    
    When 2.3.34 will be official we will need to change from 2.3.34-SNAPSHOT to
    2.3.34 in FreeMarkerWorker class
    
    I don't close yet, we will do when moving from 2.3.34-SNAPSHOT to 2.3.34
---
 dependencies.gradle                                                     | 2 +-
 .../main/java/org/apache/ofbiz/base/util/template/FreeMarkerWorker.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dependencies.gradle b/dependencies.gradle
index 685a2e25d7..38f4138979 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -70,7 +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.33' // Remember to change 
the version number in FreeMarkerWorker class when upgrading. See OFBIZ-10019 if 
>= 2.4
+    implementation 'org.freemarker:freemarker:2.3.34-SNAPSHOT' // 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
index 86974d6f2e..108eb98c3f 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_33;
+    public static final Version VERSION = Configuration.VERSION_2_3_34;
 
     private FreeMarkerWorker() { }