Increased version number to 2.3.28-nightly
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/8be28d1f Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/8be28d1f Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/8be28d1f Branch: refs/heads/2.3 Commit: 8be28d1faaed47aede3dc66a1048bbd3f23bbd4a Parents: 792ccde Author: ddekany <[email protected]> Authored: Fri Oct 27 01:02:47 2017 +0200 Committer: ddekany <[email protected]> Committed: Fri Oct 27 01:02:47 2017 +0200 ---------------------------------------------------------------------- src/main/resources/freemarker/version.properties | 9 +++++---- .../java/freemarker/template/DefaultObjectWrapperTest.java | 1 + 2 files changed, 6 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/8be28d1f/src/main/resources/freemarker/version.properties ---------------------------------------------------------------------- diff --git a/src/main/resources/freemarker/version.properties b/src/main/resources/freemarker/version.properties index 6080540..03663b2 100644 --- a/src/main/resources/freemarker/version.properties +++ b/src/main/resources/freemarker/version.properties @@ -58,11 +58,12 @@ # - When the major version number is increased, major backward # compatibility violations are allowed, but still should be avoided. # During Apache Incubation, "-incubating" is added to this string. -version=2.3.27-incubating +version=2.3.28-nightly_@timestampInVersion@-incubating # This exists as for Maven we use "-SNAPSHOT" for nightly releases, # and no _nightly_@timestampInVersion@. Also, "-incubating" is added # *before* "-SNAPSHOT". For final releases it's the same as "version". -mavenVersion=2.3.27-incubating +#!!T +mavenVersion=2.3.28-incubating-SNAPSHOT # Version string that conforms to OSGi # ------------------------------------ @@ -76,7 +77,7 @@ mavenVersion=2.3.27-incubating # 2.4.0.pre01 # 2.4.0.nightly_@timestampInVersion@ # During Apache Incubation, "-incubating" is added to this string. -versionForOSGi=2.3.27.stable-incubating +versionForOSGi=2.3.28.nightly_@timestampInVersion@-incubating # Version string that conforms to legacy MF # ----------------------------------------- @@ -95,7 +96,7 @@ versionForOSGi=2.3.27.stable-incubating # "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.27 +versionForMf=2.3.27.97 # The date of the build. # This should be automatically filled by the building tool (Ant). http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/8be28d1f/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 833f509..e6e73f4 100644 --- a/src/test/java/freemarker/template/DefaultObjectWrapperTest.java +++ b/src/test/java/freemarker/template/DefaultObjectWrapperTest.java @@ -94,6 +94,7 @@ 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 List<Version> actual = new ArrayList<Version>(); for (int i = _TemplateAPI.VERSION_INT_2_3_0; i <= Configuration.getVersion().intValue(); i++) {
