Repository: freemarker Updated Branches: refs/heads/2.3 8ee391d10 -> ea6fcf972
Incremented version number Project: http://git-wip-us.apache.org/repos/asf/freemarker/repo Commit: http://git-wip-us.apache.org/repos/asf/freemarker/commit/46618a18 Tree: http://git-wip-us.apache.org/repos/asf/freemarker/tree/46618a18 Diff: http://git-wip-us.apache.org/repos/asf/freemarker/diff/46618a18 Branch: refs/heads/2.3 Commit: 46618a18874bc985611f1148676382e43e1f3353 Parents: 8c8fb4c Author: ddekany <ddek...@apache.org> Authored: Wed Apr 4 11:25:07 2018 +0200 Committer: ddekany <ddek...@apache.org> Committed: Wed Apr 4 11:25:07 2018 +0200 ---------------------------------------------------------------------- src/main/java/freemarker/template/Configuration.java | 3 +++ src/main/java/freemarker/template/_TemplateAPI.java | 2 ++ src/main/resources/freemarker/version.properties | 8 ++++---- .../java/freemarker/template/DefaultObjectWrapperTest.java | 3 ++- 4 files changed, 11 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/freemarker/blob/46618a18/src/main/java/freemarker/template/Configuration.java ---------------------------------------------------------------------- diff --git a/src/main/java/freemarker/template/Configuration.java b/src/main/java/freemarker/template/Configuration.java index 0785d21..fa9eead 100644 --- a/src/main/java/freemarker/template/Configuration.java +++ b/src/main/java/freemarker/template/Configuration.java @@ -456,6 +456,9 @@ public class Configuration extends Configurable implements Cloneable, ParserConf /** FreeMarker version 2.3.28 (an {@link #Configuration(Version) incompatible improvements break-point}) */ public static final Version VERSION_2_3_28 = new Version(2, 3, 28); + + /** FreeMarker version 2.3.29 (an {@link #Configuration(Version) incompatible improvements break-point}) */ + public static final Version VERSION_2_3_29 = new Version(2, 3, 29); /** The default of {@link #getIncompatibleImprovements()}, currently {@link #VERSION_2_3_0}. */ public static final Version DEFAULT_INCOMPATIBLE_IMPROVEMENTS = Configuration.VERSION_2_3_0; http://git-wip-us.apache.org/repos/asf/freemarker/blob/46618a18/src/main/java/freemarker/template/_TemplateAPI.java ---------------------------------------------------------------------- diff --git a/src/main/java/freemarker/template/_TemplateAPI.java b/src/main/java/freemarker/template/_TemplateAPI.java index 124677a..30227ca 100644 --- a/src/main/java/freemarker/template/_TemplateAPI.java +++ b/src/main/java/freemarker/template/_TemplateAPI.java @@ -39,6 +39,7 @@ import freemarker.template.utility.NullArgumentException; */ public class _TemplateAPI { + // Constants for faster access... probably unnecessary and should be removed. public static final int VERSION_INT_2_3_0 = Configuration.VERSION_2_3_0.intValue(); public static final int VERSION_INT_2_3_19 = Configuration.VERSION_2_3_19.intValue(); public static final int VERSION_INT_2_3_20 = Configuration.VERSION_2_3_20.intValue(); @@ -50,6 +51,7 @@ public class _TemplateAPI { public static final int VERSION_INT_2_3_26 = Configuration.VERSION_2_3_26.intValue(); public static final int VERSION_INT_2_3_27 = Configuration.VERSION_2_3_27.intValue(); public static final int VERSION_INT_2_3_28 = Configuration.VERSION_2_3_28.intValue(); + public static final int VERSION_INT_2_3_29 = Configuration.VERSION_2_3_29.intValue(); public static final int VERSION_INT_2_4_0 = Version.intValueFor(2, 4, 0); public static void checkVersionNotNullAndSupported(Version incompatibleImprovements) { http://git-wip-us.apache.org/repos/asf/freemarker/blob/46618a18/src/main/resources/freemarker/version.properties ---------------------------------------------------------------------- diff --git a/src/main/resources/freemarker/version.properties b/src/main/resources/freemarker/version.properties index a2a44c9..59457de 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.28 +version=2.3.29-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.28 +mavenVersion=2.3.29-SNAPHSOT # Version string that conforms to OSGi # ------------------------------------ @@ -73,7 +73,7 @@ mavenVersion=2.3.28 # 2.4.0.rc01 # 2.4.0.pre01 # 2.4.0.nightly_@timestampInVersion@ -versionForOSGi=2.3.28.stable +versionForOSGi=2.3.29.nightly_@timestampInVersion@ # Version string that conforms to legacy MF # ----------------------------------------- @@ -92,7 +92,7 @@ versionForOSGi=2.3.28.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.28 +versionForMf=2.3.28.97 # The date of the build. # This should be automatically filled by the building tool (Ant). http://git-wip-us.apache.org/repos/asf/freemarker/blob/46618a18/src/test/java/freemarker/template/DefaultObjectWrapperTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/freemarker/template/DefaultObjectWrapperTest.java b/src/test/java/freemarker/template/DefaultObjectWrapperTest.java index e6e73f4..715396d 100644 --- a/src/test/java/freemarker/template/DefaultObjectWrapperTest.java +++ b/src/test/java/freemarker/template/DefaultObjectWrapperTest.java @@ -94,7 +94,8 @@ public class DefaultObjectWrapperTest { expected.add(Configuration.VERSION_2_3_24); // no non-BC change in 2.3.25 expected.add(Configuration.VERSION_2_3_26); expected.add(Configuration.VERSION_2_3_27); - expected.add(Configuration.VERSION_2_3_27); // no non-BC change in 2.3.25 + expected.add(Configuration.VERSION_2_3_27); // no non-BC change in 2.3.28 + expected.add(Configuration.VERSION_2_3_27); // no non-BC change in 2.3.29 List<Version> actual = new ArrayList<Version>(); for (int i = _TemplateAPI.VERSION_INT_2_3_0; i <= Configuration.getVersion().intValue(); i++) {
