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 e3258943d231ab7afc39761b3c33c23034bbc180 Author: ddekany <[email protected]> AuthorDate: Wed Aug 21 09:25:43 2024 +0200 Version number fixes/adjustments --- .../src/main/java/freemarker/template/Configuration.java | 5 ++++- .../src/main/resource-templates/freemarker/version.properties | 8 +++----- .../test/java/freemarker/template/DefaultObjectWrapperTest.java | 1 + freemarker-manual/src/main/docgen/en_US/book.xml | 4 ++-- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/freemarker-core/src/main/java/freemarker/template/Configuration.java b/freemarker-core/src/main/java/freemarker/template/Configuration.java index 19488049..d320a46b 100644 --- a/freemarker-core/src/main/java/freemarker/template/Configuration.java +++ b/freemarker-core/src/main/java/freemarker/template/Configuration.java @@ -492,7 +492,10 @@ public class Configuration extends Configurable implements Cloneable, ParserConf /** 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, 33); - + + /** 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); + /** 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 a8776c9b..f1df83cc 100644 --- a/freemarker-core/src/main/resource-templates/freemarker/version.properties +++ b/freemarker-core/src/main/resource-templates/freemarker/version.properties @@ -37,12 +37,10 @@ # Version number Means # 3.0.0 3.0.0 stable release # 3.3.12 3.3.12 stable release -# 3.3.13-nightly -# Modified version after 3.3.12, which will +# 3.3.13-nightly Modified version after 3.3.12, which will # become to 3.3.13 one day. # 3.4.0-pre03 The 3rd preview of version 3.4.0 -# 3.4.0-pre04-nightly -# Unreleased nightly version of the yet unfinished +# 3.4.0-pre04-nightly Unreleased nightly version of the yet unfinished # 3.4.0-pre04. # 3.4.0-rc01 1st release candidate of 3.4.0 # @@ -56,7 +54,7 @@ # 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.33-nightly +version=2.3.34-nightly # This exists as for Maven we use "-SNAPSHOT" for nightly releases, # and no _nightly. For final releases it's the # same as "version". diff --git a/freemarker-jython25/src/test/java/freemarker/template/DefaultObjectWrapperTest.java b/freemarker-jython25/src/test/java/freemarker/template/DefaultObjectWrapperTest.java index 51152998..a0885c0c 100644 --- a/freemarker-jython25/src/test/java/freemarker/template/DefaultObjectWrapperTest.java +++ b/freemarker-jython25/src/test/java/freemarker/template/DefaultObjectWrapperTest.java @@ -105,6 +105,7 @@ public class DefaultObjectWrapperTest { 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 expected.add(Configuration.VERSION_2_3_33); + expected.add(Configuration.VERSION_2_3_33); // no non-BC change in 2.3.34 List<Version> actual = new ArrayList<>(); for (int i = _VersionInts.V_2_3_0; i <= Configuration.getVersion().intValue(); i++) { diff --git a/freemarker-manual/src/main/docgen/en_US/book.xml b/freemarker-manual/src/main/docgen/en_US/book.xml index 3c80856c..46936674 100644 --- a/freemarker-manual/src/main/docgen/en_US/book.xml +++ b/freemarker-manual/src/main/docgen/en_US/book.xml @@ -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_33); +Configuration cfg = new Configuration(Configuration.VERSION_2_3_34); // 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_33); + Configuration cfg = new Configuration(Configuration.VERSION_2_3_34); cfg.setDirectoryForTemplateLoading(new File("<replaceable>/where/you/store/templates</replaceable>")); // Recommended settings for new projects: cfg.setDefaultEncoding("UTF-8");
