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: Removed "incubating" from version.
Date Tue, 27 Mar 2018 22:05:44 GMT
Repository: incubator-freemarker
Updated Branches:
  refs/heads/2.3-gae 84132a19f -> 359c2f884


Removed "incubating" from version.


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

Branch: refs/heads/2.3-gae
Commit: 359c2f8848987f14ce8f03673d6b4a5d25f549bc
Parents: 84132a1
Author: ddekany <ddekany@apache.org>
Authored: Wed Mar 28 00:05:40 2018 +0200
Committer: ddekany <ddekany@apache.org>
Committed: Wed Mar 28 00:05:40 2018 +0200

----------------------------------------------------------------------
 src/main/resources/freemarker/version.properties | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/359c2f88/src/main/resources/freemarker/version.properties
----------------------------------------------------------------------
diff --git a/src/main/resources/freemarker/version.properties b/src/main/resources/freemarker/version.properties
index ca9a433..0c6c22b 100644
--- a/src/main/resources/freemarker/version.properties
+++ b/src/main/resources/freemarker/version.properties
@@ -26,7 +26,6 @@
 #   Qualifier :: = NightlyQualifier
 #                  |
 #                  ( ('pre'|'rc') twoDigitPositiveInteger ('-' NightlyQualifier)? )
-#                  '-incubating'?
 #   NightlyQualifier :: = 'nightly_@timestampInVersion@'
 #
 # This format is compatible both with Maven and JSR 277, and it must
@@ -57,12 +56,11 @@
 #   continue working without modification or recompilation.
 # - 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.28-nightly_@timestampInVersion@-incubating
+version=2.3.28-nightly_@timestampInVersion@
 # This exists as for Maven we use "-SNAPSHOT" for nightly releases,
-# and no _nightly_@timestampInVersion@. Also, "-incubating" is added
-# *before* "-SNAPSHOT". For final releases it's the same as "version".
-mavenVersion=2.3.28-incubating-SNAPSHOT
+# and no _nightly_@timestampInVersion@. For final releases it's the
+# same as "version".
+mavenVersion=2.3.28-SNAPSHOT
 
 # Version string that conforms to OSGi
 # ------------------------------------
@@ -75,8 +73,7 @@ mavenVersion=2.3.28-incubating-SNAPSHOT
 #   2.4.0.rc01
 #   2.4.0.pre01
 #   2.4.0.nightly_@timestampInVersion@
-# During Apache Incubation, "-incubating" is added to this string.
-versionForOSGi=2.3.28.nightly_@timestampInVersion@-incubating
+versionForOSGi=2.3.28.nightly_@timestampInVersion@
 
 # Version string that conforms to legacy MF
 # -----------------------------------------


Mime
View raw message