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/03/20 22:02:51 UTC
[1/3] incubator-freemarker git commit: NOTICE content fix
Repository: incubator-freemarker
Updated Branches:
refs/heads/2.3.24-gae-stabilization 677cdf942 -> aa00a775f
NOTICE content fix
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/4bc1ce18
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/4bc1ce18
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/4bc1ce18
Branch: refs/heads/2.3.24-gae-stabilization
Commit: 4bc1ce1898c8fd0078e4d6179b0e7b729659f785
Parents: 677cdf9
Author: ddekany <dd...@apache.org>
Authored: Sun Mar 20 21:09:23 2016 +0100
Committer: ddekany <dd...@apache.org>
Committed: Sun Mar 20 21:09:23 2016 +0100
----------------------------------------------------------------------
NOTICE | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/4bc1ce18/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
index 4c7b803..9015fd9 100644
--- a/NOTICE
+++ b/NOTICE
@@ -12,10 +12,10 @@ are licensed by the Apache Software Foundation under the Apache License,
Version 2.0. This is the same license as the license of FreeMaker. These
files are:
- src/main/freemarker/ext/jsp/web-app_2_2.dtd
- src/main/freemarker/ext/jsp/web-app_2_3.dtd
- src/main/freemarker/ext/jsp/web-jsptaglibrary_1_1.dtd
- src/main/freemarker/ext/jsp/web-jsptaglibrary_1_2.dtd
+ src/main/resources/freemarker/ext/jsp/web-app_2_2.dtd
+ src/main/resources/freemarker/ext/jsp/web-app_2_3.dtd
+ src/main/resources/freemarker/ext/jsp/web-jsptaglibrary_1_1.dtd
+ src/main/resources/freemarker/ext/jsp/web-jsptaglibrary_1_2.dtd
=========================================================================
[2/3] incubator-freemarker git commit: Binary release extracted
directory name adjustment
Posted by dd...@apache.org.
Binary release extracted directory name adjustment
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/1d4064d4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/1d4064d4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/1d4064d4
Branch: refs/heads/2.3.24-gae-stabilization
Commit: 1d4064d4adb349de6b040b2b8468f4d57a405548
Parents: 4bc1ce1
Author: ddekany <dd...@apache.org>
Authored: Sun Mar 20 21:09:46 2016 +0100
Committer: ddekany <dd...@apache.org>
Committed: Sun Mar 20 21:09:46 2016 +0100
----------------------------------------------------------------------
build.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/1d4064d4/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index ff0030d..09a46be 100644
--- a/build.xml
+++ b/build.xml
@@ -95,7 +95,7 @@
<property name="dist.dir" value="build/dist" />
<property name="dist.archiveBaseName" value="apache-${mavenArtifactId}-${version}" />
- <property name="dist.bin.dir" value="${dist.dir}/bin/${dist.archiveBaseName}" />
+ <property name="dist.bin.dir" value="${dist.dir}/bin/${dist.archiveBaseName}-bin" />
<property name="dist.src.dir" value="${dist.dir}/src/${dist.archiveBaseName}-src" />
<!-- ================================================================== -->
[3/3] incubator-freemarker git commit: RELEASE-NOTES adjustment.
Posted by dd...@apache.org.
RELEASE-NOTES adjustment.
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/aa00a775
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/aa00a775
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/aa00a775
Branch: refs/heads/2.3.24-gae-stabilization
Commit: aa00a775f1fce304745b1fafb49b62cc18ac2278
Parents: 1d4064d
Author: ddekany <dd...@apache.org>
Authored: Sun Mar 20 22:02:34 2016 +0100
Committer: ddekany <dd...@apache.org>
Committed: Sun Mar 20 22:02:34 2016 +0100
----------------------------------------------------------------------
RELEASE-NOTES | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/aa00a775/RELEASE-NOTES
----------------------------------------------------------------------
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index dcf7a88..b9fc1cf 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -4,5 +4,5 @@ Where to find the change log:
http://freemarker.org/docs/app_versions.html
- Offline:
- In the binary release, open documentation/index.html, and you will find the
- link.
\ No newline at end of file
+ In the binary release, open documentation/index.html, click "Manual", then
+ find "Version history" in table of contents.