Updated version number
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/a36ea523 Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/a36ea523 Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/a36ea523 Branch: refs/heads/2.3 Commit: a36ea52359bd90fa45340537b66ec58216f8be41 Parents: 9b3d130 Author: ddekany <[email protected]> Authored: Sat Jul 8 00:51:20 2017 +0200 Committer: ddekany <[email protected]> Committed: Sat Jul 8 00:52:15 2017 +0200 ---------------------------------------------------------------------- src/main/resources/freemarker/version.properties | 11 +++++------ .../freemarker/template/DefaultObjectWrapperTest.java | 1 + 2 files changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/a36ea523/src/main/resources/freemarker/version.properties ---------------------------------------------------------------------- diff --git a/src/main/resources/freemarker/version.properties b/src/main/resources/freemarker/version.properties index 4750d18..9a1a8c5 100644 --- a/src/main/resources/freemarker/version.properties +++ b/src/main/resources/freemarker/version.properties @@ -58,12 +58,11 @@ # - 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.26-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 there. -# For final releases it's the same as "version". -# During Apache Incubation, "-incubating" is added to this string. -mavenVersion=2.3.26-incubating +version=2.3.27-nightly_@timestampInVersion@-incubating +# This exists as for Maven we use "-SNAPSHOT" for non-final releases. +# For final releases it's the same as "version". During Apache +# Incubation, "-incubating" is added *before* "-SNAPSHOT". +mavenVersion=2.3.27-incubating-SNAPSHOT # Version string that conforms to OSGi # ------------------------------------ http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/a36ea523/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 dcbc659..9a9e283 100644 --- a/src/test/java/freemarker/template/DefaultObjectWrapperTest.java +++ b/src/test/java/freemarker/template/DefaultObjectWrapperTest.java @@ -93,6 +93,7 @@ public class DefaultObjectWrapperTest { expected.add(Configuration.VERSION_2_3_24); 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_26); // no non-BC change in 2.3.27 List<Version> actual = new ArrayList<Version>(); for (int i = _TemplateAPI.VERSION_INT_2_3_0; i <= Configuration.getVersion().intValue(); i++) {
