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
commit 86455dc8fc458876df7389a983e1d650cd8a81b4 Author: ddekany <[email protected]> AuthorDate: Tue Jan 14 21:14:13 2025 +0100 Updated version to 2.3.35-SNAPSHOT --- .../src/main/java/freemarker/template/Configuration.java | 3 +++ .../src/main/resource-templates/freemarker/version.properties | 8 ++++---- .../test/java/freemarker/template/DefaultObjectWrapperTest.java | 1 + 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/freemarker-core/src/main/java/freemarker/template/Configuration.java b/freemarker-core/src/main/java/freemarker/template/Configuration.java index 4a358c2c..d5155a98 100644 --- 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 index 9e23f08e..71f57e3f 100644 --- 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 index a0885c0c..96262b48 100644 --- 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 class DefaultObjectWrapperTest { 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++) {
