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 NOTICE file to the javadoc Maven artifact
Date Wed, 13 Jan 2016 19:38:34 GMT
Repository: incubator-freemarker
Updated Branches:
  refs/heads/2.3.24-gae-stabilization 6166efe1d -> e17dd7cca


Added NOTICE file to the javadoc Maven 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/e17dd7cc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/e17dd7cc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/e17dd7cc

Branch: refs/heads/2.3.24-gae-stabilization
Commit: e17dd7ccafd819e292863110ca22c0b645d3b879
Parents: 6166efe
Author: ddekany <ddekany@apache.org>
Authored: Wed Jan 13 20:38:14 2016 +0100
Committer: ddekany <ddekany@apache.org>
Committed: Wed Jan 13 20:38:14 2016 +0100

----------------------------------------------------------------------
 build.xml                        | 8 +++++++-
 src/dist/javadoc/META-INF/NOTICE | 5 +++++
 2 files changed, 12 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/e17dd7cc/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 2d1caba..dccbb23 100644
--- a/build.xml
+++ b/build.xml
@@ -859,10 +859,16 @@
       <metainf dir="${dist.src.dir}" includes="LICENSE, NOTICE, DISCLAIMER" />
     </jar>
 
+    <mkdir dir="build/javadoc-attachment-metainf"/>
+    <copy todir="build/javadoc-attachment-metainf">
+      <fileset dir="${dist.bin.dir}" includes="LICENSE, DISCLAIMER" />
+    </copy>
+    <copy file="src/dist/javadoc/META-INF/NOTICE" todir="build/javadoc-attachment-metainf"
/>
     <jar destfile="build/maven-javadoc-attachment.jar">
       <fileset dir="${dist.bin.dir}/documentation/_html/api" />
-      <metainf dir="${dist.bin.dir}" includes="LICENSE, DISCLAIMER" />
+      <metainf dir="build/javadoc-attachment-metainf" includes="**/*" />
     </jar>
+    <delete dir="build/javadoc-attachment-metainf" />
 
     <!-- These were copy-pasted from the org.apacha:apache parent POM: -->
     <property name="maven-server-id" value="apache.releases.https" />

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/e17dd7cc/src/dist/javadoc/META-INF/NOTICE
----------------------------------------------------------------------
diff --git a/src/dist/javadoc/META-INF/NOTICE b/src/dist/javadoc/META-INF/NOTICE
new file mode 100644
index 0000000..62a65c0
--- /dev/null
+++ b/src/dist/javadoc/META-INF/NOTICE
@@ -0,0 +1,5 @@
+Apache FreeMarker
+Copyright 2015-2016 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).


Mime
View raw message