freemarker-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ddek...@apache.org
Subject incubator-freemarker git commit: Reverting version to 2.3.27-nightly for now...
Date Tue, 03 Oct 2017 18:26:43 GMT
Repository: incubator-freemarker
Updated Branches:
  refs/heads/2.3-gae 8f7879636 -> 1986341b9


Reverting version to 2.3.27-nightly for now...


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

Branch: refs/heads/2.3-gae
Commit: 1986341b959797dfebafcf49c54ccae221d6500c
Parents: 8f78796
Author: ddekany <ddekany@apache.org>
Authored: Tue Oct 3 20:26:30 2017 +0200
Committer: ddekany <ddekany@apache.org>
Committed: Tue Oct 3 20:26:30 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/1986341b/src/main/resources/freemarker/version.properties
----------------------------------------------------------------------
diff --git a/src/main/resources/freemarker/version.properties b/src/main/resources/freemarker/version.properties
index fc1445d..9a1a8c5 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).


Mime
View raw message