Author: markt
Date: Mon Aug 20 21:30:10 2018
New Revision: 1838494

URL: http://svn.apache.org/viewvc?rev=1838494&view=rev
Log:
SHA-1 has been moved to SHOULD NOT in the release policy

Modified:
    tomcat/trunk/build.xml

Modified: tomcat/trunk/build.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1838494&r1=1838493&r2=1838494&view=diff
==============================================================================
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Mon Aug 20 21:30:10 2018
@@ -1369,7 +1369,6 @@
       <fileset dir="${tomcat.embed}">
         <include name="**" />
         <exclude name="*.asc" />
-        <exclude name="*.sha1" />
         <exclude name="*.sha512" />
         <exclude name="*.zip" />
         <exclude name="*.tar.gz" />
@@ -1386,7 +1385,6 @@
       <tarfileset dir="${tomcat.embed}" prefix="${final.name}-embed">
         <include name="**" />
         <exclude name="*.asc" />
-        <exclude name="*.sha1" />
         <exclude name="*.sha512" />
         <exclude name="*.zip" />
         <exclude name="*.tar.gz" />
@@ -2216,7 +2214,6 @@ skip.installer property in build.propert
     </signcode>
     <!-- .exe has changed so need to redo checksums and OpenPGP signature -->
     <delete file="${tomcat.release}/v${version}/bin/${final.name}.exe.asc" />
-    <delete file="${tomcat.release}/v${version}/bin/${final.name}.exe.sha1" />
     <delete file="${tomcat.release}/v${version}/bin/${final.name}.exe.sha512" 
/>
     <hashAndSign file="${tomcat.release}/v${version}/bin/${final.name}.exe" />
   </target>
@@ -2256,7 +2253,6 @@ skip.installer property in build.propert
         <include name="*.zip"/>
         <include name="*.tar.gz"/>
         <include name="*.asc"/>
-        <include name="*.sha1"/>
         <include name="*.sha512"/>
       </fileset>
     </copy>
@@ -3264,14 +3260,11 @@ Read the Building page on the Apache Tom
     <attribute name="file" />
     <sequential>
       <local name="filename" />
-      <local name="sha1value" />
       <local name="sha512value" />
 
       <basename file="@{file}" property="filename" />
-      <checksum algorithm="SHA-1" file="@{file}" property="sha1value" />
       <checksum algorithm="SHA-512" file="@{file}" property="sha512value" />
 
-      <echo file="@{file}.sha1" 
message="${sha1value}${md5sum.binary-prefix}${filename}" />
       <echo file="@{file}.sha512" 
message="${sha512value}${md5sum.binary-prefix}${filename}" />
 
       <antcall target="sign" >



---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to