[3/3] incubator-freemarker git commit: Raised version to 2.3.26 (stable)

[dd...@apache.org]

Raised version to 2.3.26 (stable)


Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/1ab9ae39
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/1ab9ae39
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/1ab9ae39

Branch: refs/heads/2.3-gae
Commit: 1ab9ae39081d30e3e7a3005950f1ad96e2771bd2
Parents: 9e86f59
Author: ddekany <dd...@apache.org>
Authored: Wed Mar 15 20:31:48 2017 +0100
Committer: ddekany <dd...@apache.org>
Committed: Wed Mar 15 20:31:48 2017 +0100

----------------------------------------------------------------------
 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/1ab9ae39/src/main/resources/freemarker/version.properties
----------------------------------------------------------------------
diff --git a/src/main/resources/freemarker/version.properties b/src/main/resources/freemarker/version.properties
index c9fcce2..afdd358 100644
--- a/src/main/resources/freemarker/version.properties
+++ b/src/main/resources/freemarker/version.properties
@@ -58,12 +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.26-nightly-incubating
+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-SNAPSHOT-incubating
+mavenVersion=2.3.26-incubating
 
 # Version string that conforms to OSGi
 # ------------------------------------
@@ -77,7 +77,7 @@ mavenVersion=2.3.26-SNAPSHOT-incubating
 #   2.4.0.pre01
 #   2.4.0.nightly_@timestampInVersion@
 # During Apache Incubation, "-incubating" is added to this string.
-versionForOSGi=2.3.26.nightly_@timestampInVersion@-incubating
+versionForOSGi=2.3.26.stable-incubating
 
 # Version string that conforms to legacy MF
 # -----------------------------------------
@@ -95,7 +95,7 @@ versionForOSGi=2.3.26.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.25.97
+versionForMf=2.3.26
 
 # The date of the build.
 # This should be automatically filled by the building tool (Ant).