Updated version to 2.3.35-SNAPSHOT

apache · Jan 14, 2025 · 86455dc · 86455dc
1 parent f2b4844
commit 86455dc
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/freemarker-core/src/main/java/freemarker/template/Configuration.java b/freemarker-core/src/main/java/freemarker/template/Configuration.java
@@ -504,6 +504,9 @@ public class Configuration extends Configurable implements Cloneable, ParserConf
     /** FreeMarker version 2.3.34 (an {@link #Configuration(Version) incompatible improvements break-point}) */
     public static final Version VERSION_2_3_34 = new Version(2, 3, 34);
 
+    /** FreeMarker version 2.3.35 (an {@link #Configuration(Version) incompatible improvements break-point}) */
+    public static final Version VERSION_2_3_35 = new Version(2, 3, 35);
+
     /** 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/resource-templates/freemarker/version.properties b/freemarker-core/src/main/resource-templates/freemarker/version.properties
@@ -54,11 +54,11 @@
 #   continue working without modification or recompilation.
 # - When the major version number is increased, major backward
 #   compatibility violations are allowed, but still should be avoided.
-version=2.3.34
+version=2.3.35-nightly
 # This exists as for Maven we use "-SNAPSHOT" for nightly releases,
 # and no _nightly. For final releases it's the
 # same as "version".
-mavenVersion=2.3.34
+mavenVersion=2.3.35-SNAPSHOT
 
 # Version string that conforms to OSGi
 # ------------------------------------
@@ -71,7 +71,7 @@ mavenVersion=2.3.34
 #   2.4.0.rc01
 #   2.4.0.pre01
 #   2.4.0.nightly
-versionForOSGi=2.3.34.stable
+versionForOSGi=2.3.35.nightly
 
 # Version string that conforms to legacy MF
 # -----------------------------------------
@@ -90,7 +90,7 @@ versionForOSGi=2.3.34.stable
 # "97 denotes "nightly", 98 denotes "pre", 99 denotes "rc" build.
 # In general, for the nightly/preview/rc Y of version 2.X, the versionForMf is
 # 2.X-1.(99|98).Y. Note the X-1.
-versionForMf=2.3.34
+versionForMf=2.3.34.97
 
 
 isGAECompliant=true
diff --git a/freemarker-jython25/src/test/java/freemarker/template/DefaultObjectWrapperTest.java b/freemarker-jython25/src/test/java/freemarker/template/DefaultObjectWrapperTest.java
@@ -106,6 +106,7 @@ public void testIncompatibleImprovementsVersionBreakPoints() throws Exception {
         expected.add(Configuration.VERSION_2_3_27); // no non-BC change in 2.3.32
         expected.add(Configuration.VERSION_2_3_33);
         expected.add(Configuration.VERSION_2_3_33); // no non-BC change in 2.3.34
+        expected.add(Configuration.VERSION_2_3_33); // no non-BC change in 2.3.35
 
         List<Version> actual = new ArrayList<>();
         for (int i = _VersionInts.V_2_3_0; i <= Configuration.getVersion().intValue(); i++) {