Repository: incubator-freemarker Updated Branches: refs/heads/3 b2eba718c -> 6f1b3ba4f
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/6f1b3ba4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/6f1b3ba4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/6f1b3ba4 Branch: refs/heads/3 Commit: 6f1b3ba4fa76c5b1200960dd871e371c3562f4c2 Parents: b2eba71 Author: ddekany <[email protected]> Authored: Wed Mar 28 00:16:24 2018 +0200 Committer: ddekany <[email protected]> Committed: Wed Mar 28 00:16:24 2018 +0200 ---------------------------------------------------------------------- .../org/apache/freemarker/core/version.properties | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/6f1b3ba4/freemarker-core/src/main/resources/org/apache/freemarker/core/version.properties ---------------------------------------------------------------------- diff --git a/freemarker-core/src/main/resources/org/apache/freemarker/core/version.properties b/freemarker-core/src/main/resources/org/apache/freemarker/core/version.properties index ff1f446..08d37df 100644 --- a/freemarker-core/src/main/resources/org/apache/freemarker/core/version.properties +++ b/freemarker-core/src/main/resources/org/apache/freemarker/core/version.properties @@ -26,7 +26,6 @@ # Qualifier :: = NightlyQualifier # | # ( ('pre'|'rc') twoDigitPositiveInteger ('-' NightlyQualifier)? ) -# '-incubating'? # NightlyQualifier :: = 'nightly' # # This format is compatible both with Maven and JSR 277, and it must @@ -57,13 +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=3.0.0-nightly-incubating +version=3.0.0-nightly # 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=3.0.0-SNAPSHOT-incubating +mavenVersion=3.0.0-SNAPSHOT # Version string that conforms to OSGi # ------------------------------------ @@ -76,8 +73,7 @@ mavenVersion=3.0.0-SNAPSHOT-incubating # 2.4.0.rc01 # 2.4.0.pre01 # 2.4.0.nightly_@timestampInVersion@ -# During Apache Incubation, "-incubating" is added to this string. -versionForOSGi=3.0.0.nightly_@timestampInVersion@-incubating +versionForOSGi=3.0.0.nightly_@timestampInVersion@ # Version string that conforms to legacy MF # -----------------------------------------
