Adjusting version number (which now ends with "-incubating").
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/d5de8ad8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/d5de8ad8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/d5de8ad8 Branch: refs/heads/master Commit: d5de8ad896eba7e39d3c3dff08c460c3a7221ef6 Parents: b8e8187 Author: ddekany <[email protected]> Authored: Sat Jan 2 12:09:37 2016 +0100 Committer: ddekany <[email protected]> Committed: Sat Jan 2 12:09:37 2016 +0100 ---------------------------------------------------------------------- src/main/resources/freemarker/version.properties | 12 +++++++----- .../java/freemarker/template/VersionTest.java | 18 ++++++++++++++++++ 2 files changed, 25 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/d5de8ad8/src/main/resources/freemarker/version.properties ---------------------------------------------------------------------- diff --git a/src/main/resources/freemarker/version.properties b/src/main/resources/freemarker/version.properties index 1b7de72..e209196 100644 --- a/src/main/resources/freemarker/version.properties +++ b/src/main/resources/freemarker/version.properties @@ -26,6 +26,7 @@ # Qualifier :: = NightlyQualifier # | # ( ('pre'|'rc') twoDigitPositiveInteger ('-' NightlyQualifier)? ) +# '-incubating'? # NightlyQualifier :: = 'nightly_@timestampInVersion@' # # This format is compatible both with Maven and JSR 277, and it must @@ -56,11 +57,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.24-pre01 +version=2.3.24-rc01-incubating # This exists as oss.sonatype only allows SNAPSHOT and final releases, -# so instead 2.3.21-rc01 and such we have to use 2.3.21-SNAPSHOT. +# so instead 2.3.21-rc01 and such we have to use 2.3.21-SNAPSHOT there. # For final releases it's the same as "version". -mavenVersion=2.3.24-SNAPSHOT +mavenVersion=2.3.24-rc01-incubating # Version string that conforms to OSGi # ------------------------------------ @@ -73,7 +74,8 @@ mavenVersion=2.3.24-SNAPSHOT # 2.4.0.rc01 # 2.4.0.pre01 # 2.4.0.nightly_@timestampInVersion@ -versionForOSGi=2.3.24.pre01 +# During Apache Incubation, "-incubating" is added to this string. +versionForOSGi=2.3.24.rc01-incubating # Version string that conforms to legacy MF # ----------------------------------------- @@ -91,7 +93,7 @@ versionForOSGi=2.3.24.pre01 # "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.23.98.1 +versionForMf=2.3.23.99.1 # 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/d5de8ad8/src/test/java/freemarker/template/VersionTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/freemarker/template/VersionTest.java b/src/test/java/freemarker/template/VersionTest.java index 3d74cc1..560e428 100644 --- a/src/test/java/freemarker/template/VersionTest.java +++ b/src/test/java/freemarker/template/VersionTest.java @@ -58,6 +58,14 @@ public class VersionTest { assertEquals(3, v.getMicro()); } + public void testFromNumberIncubating() { + Version v = new Version(2, 3, 24, "rc01-incubating", Boolean.FALSE, new Date(5000)); + assertEquals("2.3.24-rc01-incubating", v.toString()); + assertEquals("rc01-incubating", v.getExtraInfo()); + assertFalse(v.isGAECompliant().booleanValue()); + assertEquals(new Date(5000), v.getBuildDate()); + } + @Test public void testFromString() { Version v = new Version("1.2.3-beta2"); @@ -112,6 +120,16 @@ public class VersionTest { assertEquals("mod", v.getExtraInfo()); } + + @Test + public void testFromStringIncubating() { + Version v = new Version("2.3.24-rc01-incubating"); + assertEquals("2.3.24-rc01-incubating", v.toString()); + assertEquals(2, v.getMajor()); + assertEquals(3, v.getMinor()); + assertEquals(24, v.getMicro()); + assertEquals("rc01-incubating", v.getExtraInfo()); + } @Test public void testHashAndEquals() {
