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 172bffc2603b20ab902642d0da25d921dbdbdc45 Author: ddekany <[email protected]> AuthorDate: Sat Oct 23 11:29:15 2021 +0200 Updated version to 2.3.32-SNAPSHOT --- src/main/java/freemarker/template/Configuration.java | 3 +++ src/main/java/freemarker/template/_TemplateAPI.java | 1 + src/main/resources/freemarker/version.properties | 8 ++++---- src/test/java/freemarker/template/DefaultObjectWrapperTest.java | 1 + 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/main/java/freemarker/template/Configuration.java b/src/main/java/freemarker/template/Configuration.java index eb189ee..ed47cba 100644 --- a/src/main/java/freemarker/template/Configuration.java +++ b/src/main/java/freemarker/template/Configuration.java @@ -475,6 +475,9 @@ public class Configuration extends Configurable implements Cloneable, ParserConf /** FreeMarker version 2.3.31 (an {@link #Configuration(Version) incompatible improvements break-point}) */ public static final Version VERSION_2_3_31 = new Version(2, 3, 31); + /** FreeMarker version 2.3.31 (an {@link #Configuration(Version) incompatible improvements break-point}) */ + public static final Version VERSION_2_3_32 = 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/src/main/java/freemarker/template/_TemplateAPI.java b/src/main/java/freemarker/template/_TemplateAPI.java index 5ff74de..a43842f 100644 --- a/src/main/java/freemarker/template/_TemplateAPI.java +++ b/src/main/java/freemarker/template/_TemplateAPI.java @@ -55,6 +55,7 @@ public class _TemplateAPI { public static final int VERSION_INT_2_3_29 = Configuration.VERSION_2_3_29.intValue(); public static final int VERSION_INT_2_3_30 = Configuration.VERSION_2_3_30.intValue(); public static final int VERSION_INT_2_3_31 = Configuration.VERSION_2_3_31.intValue(); + public static final int VERSION_INT_2_3_32 = Configuration.VERSION_2_3_32.intValue(); public static final int VERSION_INT_2_4_0 = Version.intValueFor(2, 4, 0); /** diff --git a/src/main/resources/freemarker/version.properties b/src/main/resources/freemarker/version.properties index 9c39042..efb9805 100644 --- a/src/main/resources/freemarker/version.properties +++ b/src/main/resources/freemarker/version.properties @@ -56,11 +56,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.31 +version=2.3.32-nightly_@timestampInVersion@ # This exists as for Maven we use "-SNAPSHOT" for nightly releases, # and no _nightly_@timestampInVersion@. For final releases it's the # same as "version". -mavenVersion=2.3.31 +mavenVersion=2.3.32-SNAPSHOT # Version string that conforms to OSGi # ------------------------------------ @@ -73,7 +73,7 @@ mavenVersion=2.3.31 # 2.4.0.rc01 # 2.4.0.pre01 # 2.4.0.nightly_@timestampInVersion@ -versionForOSGi=2.3.31.stable +versionForOSGi=2.3.32.nightly_@timestampInVersion@ # Version string that conforms to legacy MF # ----------------------------------------- @@ -92,7 +92,7 @@ versionForOSGi=2.3.31.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.31 +versionForMf=2.3.31.97 # The date of the build. # This should be automatically filled by the building tool (Ant). diff --git a/src/test/java/freemarker/template/DefaultObjectWrapperTest.java b/src/test/java/freemarker/template/DefaultObjectWrapperTest.java index d9924f1..17c6702 100644 --- a/src/test/java/freemarker/template/DefaultObjectWrapperTest.java +++ b/src/test/java/freemarker/template/DefaultObjectWrapperTest.java @@ -103,6 +103,7 @@ public class DefaultObjectWrapperTest { expected.add(Configuration.VERSION_2_3_27); // no non-BC change in 2.3.29 expected.add(Configuration.VERSION_2_3_27); // no non-BC change in 2.3.30 expected.add(Configuration.VERSION_2_3_27); // no non-BC change in 2.3.31 + expected.add(Configuration.VERSION_2_3_27); // no non-BC change in 2.3.32 List<Version> actual = new ArrayList<>(); for (int i = _TemplateAPI.VERSION_INT_2_3_0; i <= Configuration.getVersion().intValue(); i++) {
