freemarker-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ddek...@apache.org
Subject [1/2] incubator-freemarker git commit: Build: Added NOTICE and DISCLAIMER under META-INF in freemarker.jar. Added LICENSE, NOTICE, DISCLAIMER under META-INF to the Maven source artifact. Added LICENSE, DISCLAIMER under META-INF to the Maven javadoc artif
Date Thu, 07 Jan 2016 16:44:24 GMT
Repository: incubator-freemarker
Updated Branches:
  refs/heads/2.3 599e0fdbe -> 9a4f59888


Build: Added NOTICE and DISCLAIMER under META-INF in freemarker.jar. Added LICENSE, NOTICE,
DISCLAIMER under META-INF to the Maven source artifact. Added LICENSE, DISCLAIMER under META-INF
to the Maven javadoc artifact.


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

Branch: refs/heads/2.3
Commit: b968ffaf2b52225e57ec196aaa3ee7345fa0024d
Parents: da6180e
Author: ddekany <ddekany@apache.org>
Authored: Thu Jan 7 17:19:16 2016 +0100
Committer: ddekany <ddekany@apache.org>
Committed: Thu Jan 7 17:19:16 2016 +0100

----------------------------------------------------------------------
 build.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/b968ffaf/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index b072cc5..2d1caba 100644
--- a/build.xml
+++ b/build.xml
@@ -339,9 +339,7 @@
       />
     </copy>
     <copy toDir="build/classes/META-INF">
-      <fileset dir="."
-        includes="LICENSE"
-      />
+      <fileset dir="." includes="LICENSE, NOTICE, DISCLAIMER" />
     </copy>
   </target>
 
@@ -858,10 +856,12 @@
     <jar destfile="build/maven-source-attachment.jar">
       <fileset dir="${dist.src.dir}/src/main/java" />
       <fileset dir="${dist.src.dir}/src/main/resources" />
+      <metainf dir="${dist.src.dir}" includes="LICENSE, NOTICE, DISCLAIMER" />
     </jar>
 
     <jar destfile="build/maven-javadoc-attachment.jar">
       <fileset dir="${dist.bin.dir}/documentation/_html/api" />
+      <metainf dir="${dist.bin.dir}" includes="LICENSE, DISCLAIMER" />
     </jar>
 
     <!-- These were copy-pasted from the org.apacha:apache parent POM: -->


Mime
View raw message