Repository: incubator-freemarker Updated Branches: refs/heads/2.3 f73b8447c -> 06955e1c0
version.properties change that's somehow missing from the last merge Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/06955e1c Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/06955e1c Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/06955e1c Branch: refs/heads/2.3 Commit: 06955e1c0958563a4232005860b6dc4ac0639e3b Parents: f73b844 Author: ddekany <[email protected]> Authored: Tue Oct 3 21:46:38 2017 +0200 Committer: ddekany <[email protected]> Committed: Tue Oct 3 21:46:38 2017 +0200 ---------------------------------------------------------------------- src/main/resources/freemarker/version.properties | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/06955e1c/src/main/resources/freemarker/version.properties ---------------------------------------------------------------------- diff --git a/src/main/resources/freemarker/version.properties b/src/main/resources/freemarker/version.properties index 13eaee4..4281676 100644 --- a/src/main/resources/freemarker/version.properties +++ b/src/main/resources/freemarker/version.properties @@ -58,11 +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.27-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 +mavenVersion=2.3.27-incubating-SNAPSHOT # Version string that conforms to OSGi # ------------------------------------ @@ -76,7 +76,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.27.nightly_@timestampInVersion@-incubating # Version string that conforms to legacy MF # ----------------------------------------- @@ -95,7 +95,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.26.97 # The date of the build. # This should be automatically filled by the building tool (Ant).
