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 2017/10/05 08:12:13 UTC
incubator-freemarker git commit: Use "-SNAPSHOT" for nightly release
dists instead of the timestamp. This is to ease maven depoyment.
Repository: incubator-freemarker
Updated Branches:
refs/heads/2.3-gae d37f51387 -> 7923f5cfd
Use "-SNAPSHOT" for nightly release dists instead of the timestamp. This is to ease maven depoyment.
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/7923f5cf
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/7923f5cf
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/7923f5cf
Branch: refs/heads/2.3-gae
Commit: 7923f5cfdaed55b4c6d7b4375411e54b6dd7c34c
Parents: d37f513
Author: ddekany <dd...@apache.org>
Authored: Thu Oct 5 10:12:07 2017 +0200
Committer: ddekany <dd...@apache.org>
Committed: Thu Oct 5 10:12:07 2017 +0200
----------------------------------------------------------------------
build.xml | 2 +-
src/main/resources/freemarker/version.properties | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/7923f5cf/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 88deeea..fd73ab0 100644
--- a/build.xml
+++ b/build.xml
@@ -101,7 +101,7 @@
<filter token="version" value="${version}" />
<property name="dist.dir" value="build/dist" />
- <property name="dist.archiveBaseName" value="apache-${mavenArtifactId}-${version}" />
+ <property name="dist.archiveBaseName" value="apache-${mavenArtifactId}-${mavenVersion}" />
<property name="dist.bin.dir" value="${dist.dir}/bin/${dist.archiveBaseName}-bin" />
<property name="dist.src.dir" value="${dist.dir}/src/${dist.archiveBaseName}-src" />
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/7923f5cf/src/main/resources/freemarker/version.properties
----------------------------------------------------------------------
diff --git a/src/main/resources/freemarker/version.properties b/src/main/resources/freemarker/version.properties
index 9a1a8c5..6223223 100644
--- a/src/main/resources/freemarker/version.properties
+++ b/src/main/resources/freemarker/version.properties
@@ -59,9 +59,9 @@
# compatibility violations are allowed, but still should be avoided.
# During Apache Incubation, "-incubating" is added to this string.
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".
+# 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.27-incubating-SNAPSHOT
# Version string that conforms to OSGi