freemarker-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ddek...@apache.org
Subject incubator-freemarker git commit: Added special NOTICE file to the jar META-INF, as the source NOTICE content wasn't exactly fitting
Date Wed, 13 Jan 2016 23:48:23 GMT
Repository: incubator-freemarker
Updated Branches:
  refs/heads/2.3.24-gae-stabilization 34043caec -> 0c71d8f99


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.24-gae-stabilization
Commit: 0c71d8f99323577d9683d924c51d617eb0346d15
Parents: 34043ca
Author: ddekany <ddekany@apache.org>
Authored: Thu Jan 14 00:48:14 2016 +0100
Committer: ddekany <ddekany@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
+
+===========================================================================


Mime
View raw message