commit c441d1f1691b0216e9b7bd4cadc3141fd55bb575
author ddekany <ddekany@apache.org> Thu Jan 07 18:12:37 2016 +0100
committer ddekany <ddekany@apache.org> Thu Jan 07 18:12:37 2016 +0100
tree ee4ed6922f810c0e91a6a5d342c071049dc2d651
parent 80da52a5eff9189fe28ae1da2b64c3c466c13fcf
parent b968ffaf2b52225e57ec196aaa3ee7345fa0024d

Merge remote-tracking branch 'origin/2.3-gae'

build.xml

diff --git a/build.xml b/build.xml
index e7e78a1..ceae505 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: -->