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/26 16:19:50 UTC
[04/30] incubator-freemarker git commit: Added special NOTICE file to
the jar META-INF, as the source NOTICE content wasn't exactly fitting
Added special NOTICE file to the jar META-INF, as the source NOTICE content wasn't exactly fitting
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/0c71d8f9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/0c71d8f9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/0c71d8f9
Branch: refs/heads/2.3-gae
Commit: 0c71d8f99323577d9683d924c51d617eb0346d15
Parents: 34043ca
Author: ddekany <dd...@apache.org>
Authored: Thu Jan 14 00:48:14 2016 +0100
Committer: ddekany <dd...@apache.org>
Committed: Thu Jan 14 00:48:14 2016 +0100
----------------------------------------------------------------------
build.xml | 5 ++++-
src/dist/jar/META-INF/NOTICE | 22 ++++++++++++++++++++++
2 files changed, 26 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/0c71d8f9/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index d5e78f0..f37a350 100644
--- a/build.xml
+++ b/build.xml
@@ -342,7 +342,10 @@
/>
</copy>
<copy toDir="build/classes/META-INF">
- <fileset dir="." includes="LICENSE, NOTICE, DISCLAIMER" />
+ <fileset dir="." includes="LICENSE, DISCLAIMER" />
+ </copy>
+ <copy toDir="build/classes/META-INF">
+ <fileset dir="src/dist/jar/META-INF" includes="*" />
</copy>
</target>
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/0c71d8f9/src/dist/jar/META-INF/NOTICE
----------------------------------------------------------------------
diff --git a/src/dist/jar/META-INF/NOTICE b/src/dist/jar/META-INF/NOTICE
new file mode 100644
index 0000000..53915b3
--- /dev/null
+++ b/src/dist/jar/META-INF/NOTICE
@@ -0,0 +1,22 @@
+===========================================================================
+
+Apache FreeMarker
+Copyright 2015-2016 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+===========================================================================
+
+FreeMarker, both in its source code and binary form (freemarker.jar)
+includes files that were developed outside the FreeMarker project, and
+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 in the FreeMarker binary (inside the jar file) are:
+
+ freemarker/ext/jsp/web-app_2_2.dtd
+ freemarker/ext/jsp/web-app_2_3.dtd
+ freemarker/ext/jsp/web-jsptaglibrary_1_1.dtd
+ freemarker/ext/jsp/web-jsptaglibrary_1_2.dtd
+
+===========================================================================