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 2016/01/07 21:17:08 UTC

[1/4] incubator-freemarker git commit: Modified Maven version from 2.3.24-rc01-incubating to 2.3.24-SNAPSHOT, so that I can deploy to the snapshot repo.

Repository: incubator-freemarker
Updated Branches:
  refs/heads/2.3 9a4f59888 -> ce1dc19b3


Modified Maven version from 2.3.24-rc01-incubating to 2.3.24-SNAPSHOT, so that I can deploy to the snapshot repo.


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

Branch: refs/heads/2.3
Commit: c9e50fa0d8c4f1cedce9a34936184a2b1f3b15b9
Parents: b968ffa
Author: ddekany <dd...@apache.org>
Authored: Thu Jan 7 20:53:17 2016 +0100
Committer: ddekany <dd...@apache.org>
Committed: Thu Jan 7 20:53:17 2016 +0100

----------------------------------------------------------------------
 src/main/resources/freemarker/version.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/c9e50fa0/src/main/resources/freemarker/version.properties
----------------------------------------------------------------------
diff --git a/src/main/resources/freemarker/version.properties b/src/main/resources/freemarker/version.properties
index e209196..c02c4a7 100644
--- a/src/main/resources/freemarker/version.properties
+++ b/src/main/resources/freemarker/version.properties
@@ -61,7 +61,7 @@ version=2.3.24-rc01-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".
-mavenVersion=2.3.24-rc01-incubating
+mavenVersion=2.3.24-SNAPSHOT
 
 # Version string that conforms to OSGi
 # ------------------------------------


[2/4] incubator-freemarker git commit: Merge remote-tracking branch 'origin/2.3-gae' into 2.3

Posted by dd...@apache.org.
Merge remote-tracking branch 'origin/2.3-gae' into 2.3


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

Branch: refs/heads/2.3
Commit: af1d5554020a75cd9957f2d08a09d5dfa86c38c8
Parents: 9a4f598 c9e50fa
Author: ddekany <dd...@apache.org>
Authored: Thu Jan 7 20:53:49 2016 +0100
Committer: ddekany <dd...@apache.org>
Committed: Thu Jan 7 20:53:49 2016 +0100

----------------------------------------------------------------------
 src/main/resources/freemarker/version.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/af1d5554/src/main/resources/freemarker/version.properties
----------------------------------------------------------------------


[4/4] incubator-freemarker git commit: Merge remote-tracking branch 'origin/2.3-gae' into 2.3

Posted by dd...@apache.org.
Merge remote-tracking branch 'origin/2.3-gae' into 2.3


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

Branch: refs/heads/2.3
Commit: ce1dc19b3ccfb734af551c2d694a3a3d1039f7fa
Parents: af1d555 6166efe
Author: ddekany <dd...@apache.org>
Authored: Thu Jan 7 21:16:56 2016 +0100
Committer: ddekany <dd...@apache.org>
Committed: Thu Jan 7 21:16:56 2016 +0100

----------------------------------------------------------------------
 src/main/resources/freemarker/version.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ce1dc19b/src/main/resources/freemarker/version.properties
----------------------------------------------------------------------


[3/4] incubator-freemarker git commit: Revert "Modified Maven version from 2.3.24-rc01-incubating to 2.3.24-SNAPSHOT, so that I can deploy to the snapshot repo."

Posted by dd...@apache.org.
Revert "Modified Maven version from 2.3.24-rc01-incubating to 2.3.24-SNAPSHOT, so that I can deploy to the snapshot repo."

This reverts commit c9e50fa0d8c4f1cedce9a34936184a2b1f3b15b9.


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

Branch: refs/heads/2.3
Commit: 6166efe1d02fe89a98c7d87ab26a608e2d560492
Parents: c9e50fa
Author: ddekany <dd...@apache.org>
Authored: Thu Jan 7 21:09:51 2016 +0100
Committer: ddekany <dd...@apache.org>
Committed: Thu Jan 7 21:09:51 2016 +0100

----------------------------------------------------------------------
 src/main/resources/freemarker/version.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/6166efe1/src/main/resources/freemarker/version.properties
----------------------------------------------------------------------
diff --git a/src/main/resources/freemarker/version.properties b/src/main/resources/freemarker/version.properties
index c02c4a7..e209196 100644
--- a/src/main/resources/freemarker/version.properties
+++ b/src/main/resources/freemarker/version.properties
@@ -61,7 +61,7 @@ version=2.3.24-rc01-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".
-mavenVersion=2.3.24-SNAPSHOT
+mavenVersion=2.3.24-rc01-incubating
 
 # Version string that conforms to OSGi
 # ------------------------------------