From 44a1861ee30ebbe9c049497a28102d9a92e806b8 Mon Sep 17 00:00:00 2001
From: Andreas Beeker <kiwiwings@apache.org>
Date: Sat, 1 Sep 2018 22:58:51 +0000
Subject: [PATCH] Add SHA256 to release-prep and legal/* to ooxml-schemas

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1839861 13f79535-47bb-0310-9956-ffa450edef68
---
 build.xml | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/build.xml b/build.xml
index 930b7a7148..ac7e645fac 100644
--- a/build.xml
+++ b/build.xml
@@ -958,8 +958,14 @@ under the License.
                 <classpath refid="ooxml.classpath"/>
             </javac>
 
-            <jar basedir="${xmlbean.classes.dir}" destfile="@{classes-jar}" excludes="org/apache/**" level="9" />
-            <jar basedir="${xmlbean.sources.dir}" destfile="@{sources-jar}" excludes="org/apache/**" level="9" />
+            <jar destfile="@{classes-jar}" level="9">
+                <fileset dir="${xmlbean.classes.dir}" excludes="org/apache/**"/>
+                <metainf dir="legal"/>
+            </jar>
+            <jar destfile="@{sources-jar}" level="9">
+                <fileset dir="${xmlbean.sources.dir}" excludes="org/apache/**"/>
+                <metainf dir="legal"/>
+            </jar>
 
             <delete file="${xmlbean.xsds.dir}.jar"/>
             <delete dir="${xmlbean.xsds.dir}"/>
@@ -2129,7 +2135,7 @@ under the License.
         <antcall target="maven-poms"/>
 
         <echo>Distribution located in ${dist.dir}</echo>
-        <echo>Use "ant dist-checksum" to create md5/sha1/sha512 checksums and GPG signatures</echo>
+        <echo>Use "ant dist-checksum" to create sha256/sha512 checksums and GPG signatures</echo>
     </target>
 
     <target name="osgi" depends="mvn-install">
@@ -2375,17 +2381,20 @@ under the License.
     <target name="dist-checksum" depends="load-maven-server-settings">
         <fileset id="dist-archives" dir="${dist.dir}" includes="**/*.jar,**/*.pom,**/*.zip,**/*.tar.gz"/>
 
-        <checksum algorithm="SHA-512" fileext=".sha512" format="MD5SUM">
-            <fileset refid="dist-archives"/>
-        </checksum>
         <checksum algorithm="sha1" format="MD5SUM">
             <fileset refid="dist-archives"/>
         </checksum>
         <checksum algorithm="md5" format="MD5SUM">
             <fileset refid="dist-archives"/>
         </checksum>
+        <checksum algorithm="SHA-256" fileext=".sha256" format="MD5SUM">
+            <fileset refid="dist-archives"/>
+        </checksum>
+        <checksum algorithm="SHA-512" fileext=".sha512" format="MD5SUM">
+            <fileset refid="dist-archives"/>
+        </checksum>
 
-        <fixcrlf srcDir="${dist.dir}" includes="**/*.md5,**/*.sha1,**/*.sha512" eol="unix"/>
+        <fixcrlf srcDir="${dist.dir}" includes="**/*.md5,**/*.sha1,**/*.sha256,**/*.sha512" eol="unix"/>
 
         <downloadfile src="${dist.bouncycastle-prov.url}" dest="${dist.bouncycastle-prov.jar}"/>
         <downloadfile src="${dist.bouncycastle-bcpg.url}" dest="${dist.bouncycastle-bcpg.jar}"/>
@@ -2466,7 +2475,7 @@ under the License.
                 <fileset dir="${metadir}" includes="maven-metadata.xml"/>
             </checksum>
 
-            <fixcrlf srcDir="${metadir}" includes="*.md5,*.sha1,*.sha512" eol="unix"/>
+            <fixcrlf srcDir="${metadir}" includes="*.md5,*.sha1,*.sha256,*.sha512" eol="unix"/>
 
             <downloadfile src="${dist.nexus-staging.url}" dest="${dist.nexus-staging.jar}"/>
             <taskdef uri="antlib:org.sonatype.nexus.ant.staging" resource="org/sonatype/nexus/ant/staging/antlib.xml">