(freemarker) branch 2.3-gae updated: Added Configuration.VERSION_2_3_33 constant

[ddekany]

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

ddekany pushed a commit to branch 2.3-gae
in repository https://gitbox.apache.org/repos/asf/freemarker.git


The following commit(s) were added to refs/heads/2.3-gae by this push:
     new 9f2ad39a Added Configuration.VERSION_2_3_33 constant
9f2ad39a is described below

commit 9f2ad39a16469aeb7b5d14e558026b4f0bfd6bec
Author: ddekany <ddek...@apache.org>
AuthorDate: Tue Dec 26 12:34:51 2023 +0100

    Added Configuration.VERSION_2_3_33 constant
---
 freemarker-core/src/main/java/freemarker/core/EvalUtil.java         | 2 +-
 .../src/main/java/freemarker/template/Configuration.java            | 3 +++
 freemarker-core/src/main/java/freemarker/template/_VersionInts.java | 1 +
 freemarker-manual/src/main/docgen/en_US/book.xml                    | 6 +++---
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/freemarker-core/src/main/java/freemarker/core/EvalUtil.java 
b/freemarker-core/src/main/java/freemarker/core/EvalUtil.java
index 7bb95471..f7025646 100644
--- a/freemarker-core/src/main/java/freemarker/core/EvalUtil.java
+++ b/freemarker-core/src/main/java/freemarker/core/EvalUtil.java
@@ -278,7 +278,7 @@ class EvalUtil {
             }
             String leftString = EvalUtil.modelToString((TemplateScalarModel) 
leftValue, leftExp, env);
             String rightString = EvalUtil.modelToString((TemplateScalarModel) 
rightValue, rightExp, env);
-            if 
(env.getConfiguration().getIncompatibleImprovements().intValue() <= 
_VersionInts.V_2_3_32) {
+            if 
(env.getConfiguration().getIncompatibleImprovements().intValue() < 
_VersionInts.V_2_3_33) {
                 cmpResult = env.getCollator().compare(leftString, rightString);
             } else {
                 cmpResult = Normalizer.normalize(leftString, 
Normalizer.Form.NFKC)
diff --git 
a/freemarker-core/src/main/java/freemarker/template/Configuration.java 
b/freemarker-core/src/main/java/freemarker/template/Configuration.java
index 8f2af85f..c29d2077 100644
--- a/freemarker-core/src/main/java/freemarker/template/Configuration.java
+++ b/freemarker-core/src/main/java/freemarker/template/Configuration.java
@@ -492,6 +492,9 @@ public class Configuration extends Configurable implements 
Cloneable, ParserConf
     /** FreeMarker version 2.3.32 (an {@link #Configuration(Version) 
incompatible improvements break-point}) */
     public static final Version VERSION_2_3_32 = new Version(2, 3, 32);
 
+    /** FreeMarker version 2.3.33 (an {@link #Configuration(Version) 
incompatible improvements break-point}) */
+    public static final Version VERSION_2_3_33 = new Version(2, 3, 32);
+    
     /** The default of {@link #getIncompatibleImprovements()}, currently 
{@link #VERSION_2_3_0}. */
     public static final Version DEFAULT_INCOMPATIBLE_IMPROVEMENTS = 
Configuration.VERSION_2_3_0;
     /** @deprecated Use {@link #DEFAULT_INCOMPATIBLE_IMPROVEMENTS} instead. */
diff --git 
a/freemarker-core/src/main/java/freemarker/template/_VersionInts.java 
b/freemarker-core/src/main/java/freemarker/template/_VersionInts.java
index 22ba09d8..69ca09a7 100644
--- a/freemarker-core/src/main/java/freemarker/template/_VersionInts.java
+++ b/freemarker-core/src/main/java/freemarker/template/_VersionInts.java
@@ -46,5 +46,6 @@ public final class _VersionInts {
     public static final int V_2_3_30 = Configuration.VERSION_2_3_30.intValue();
     public static final int V_2_3_31 = Configuration.VERSION_2_3_31.intValue();
     public static final int V_2_3_32 = Configuration.VERSION_2_3_32.intValue();
+    public static final int V_2_3_33 = Configuration.VERSION_2_3_33.intValue();
     public static final int V_2_4_0 = Version.intValueFor(2, 4, 0);
 }
diff --git a/freemarker-manual/src/main/docgen/en_US/book.xml 
b/freemarker-manual/src/main/docgen/en_US/book.xml
index 9d184e00..e1942050 100644
--- a/freemarker-manual/src/main/docgen/en_US/book.xml
+++ b/freemarker-manual/src/main/docgen/en_US/book.xml
@@ -26,7 +26,7 @@
 
     <titleabbrev>Manual</titleabbrev>
 
-    <productname>Freemarker 2.3.32</productname>
+    <productname>Freemarker 2.3.33</productname>
   </info>
 
   <preface role="index.html" xml:id="preface">
@@ -6659,7 +6659,7 @@ That's all.</programlisting>
         <programlisting role="unspecified">// Create your Configuration 
instance, and specify if up to what FreeMarker
 // version (here 2.3.32) do you want to apply the fixes that are not 100%
 // backward-compatible. See the Configuration JavaDoc for details.
-Configuration cfg = new Configuration(Configuration.VERSION_2_3_32);
+Configuration cfg = new Configuration(Configuration.VERSION_2_3_33);
 
 // Specify the source where the template files come from. Here I set a
 // plain directory for it, but non-file-system sources are possible too:
@@ -6958,7 +6958,7 @@ public class Test {
         /* You should do this ONLY ONCE in the whole application life-cycle:   
     */
 
         /* Create and adjust the configuration singleton */
-        Configuration cfg = new Configuration(Configuration.VERSION_2_3_32);
+        Configuration cfg = new Configuration(Configuration.VERSION_2_3_33);
         cfg.setDirectoryForTemplateLoading(new 
File("<replaceable>/where/you/store/templates</replaceable>"));
         // Recommended settings for new projects:
         cfg.setDefaultEncoding("UTF-8");