You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@freemarker.apache.org by dd...@apache.org on 2016/06/12 16:11:34 UTC
[2/2] incubator-freemarker git commit: Version number update to
2.3.25-incubating
Version number update to 2.3.25-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/08e4f1da
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/08e4f1da
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/08e4f1da
Branch: refs/heads/2.3-gae
Commit: 08e4f1daad3f6b472c32fa9c81e5e4c8bea1d2c1
Parents: 66bcd01
Author: ddekany <dd...@apache.org>
Authored: Sun Jun 12 18:11:15 2016 +0200
Committer: ddekany <dd...@apache.org>
Committed: Sun Jun 12 18:11:15 2016 +0200
----------------------------------------------------------------------
src/main/resources/freemarker/version.properties | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/08e4f1da/src/main/resources/freemarker/version.properties
----------------------------------------------------------------------
diff --git a/src/main/resources/freemarker/version.properties b/src/main/resources/freemarker/version.properties
index 2f7600c..04a41da 100644
--- a/src/main/resources/freemarker/version.properties
+++ b/src/main/resources/freemarker/version.properties
@@ -57,11 +57,13 @@
# 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.25-incubating-SNAPSHOT
+# During Apache Incubation, "-incubating" is added to this string.
+version=2.3.25-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".
-mavenVersion=2.3.25-incubating-SNAPSHOT
+# During Apache Incubation, "-incubating" is added to this string.
+mavenVersion=2.3.25-incubating
# Version string that conforms to OSGi
# ------------------------------------
@@ -75,7 +77,7 @@ mavenVersion=2.3.25-incubating-SNAPSHOT
# 2.4.0.pre01
# 2.4.0.nightly_@timestampInVersion@
# During Apache Incubation, "-incubating" is added to this string.
-versionForOSGi=2.3.25.nightly_@timestampInVersion@-incubating
+versionForOSGi=2.3.25.stable-incubating
# Version string that conforms to legacy MF
# -----------------------------------------
@@ -93,7 +95,7 @@ versionForOSGi=2.3.25.nightly_@timestampInVersion@-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.24.97
+versionForMf=2.3.25
# The date of the build.
# This should be automatically filled by the building tool (Ant).