You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@knox.apache.org by kr...@apache.org on 2018/11/27 02:32:10 UTC

knox git commit: KNOX-1630 - Generate sha256 and sha512 checksums instead of md5 and sha1

Repository: knox
Updated Branches:
  refs/heads/master a60b03296 -> 0edcb9795


KNOX-1630 - Generate sha256 and sha512 checksums instead of md5 and sha1

Signed-off-by: Kevin Risden <kr...@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/knox/repo
Commit: http://git-wip-us.apache.org/repos/asf/knox/commit/0edcb979
Tree: http://git-wip-us.apache.org/repos/asf/knox/tree/0edcb979
Diff: http://git-wip-us.apache.org/repos/asf/knox/diff/0edcb979

Branch: refs/heads/master
Commit: 0edcb97954e89c8a82e73e5101ebf8b448692ec5
Parents: a60b032
Author: Kevin Risden <kr...@apache.org>
Authored: Mon Nov 26 17:09:42 2018 -0500
Committer: Kevin Risden <kr...@apache.org>
Committed: Mon Nov 26 21:07:25 2018 -0500

----------------------------------------------------------------------
 build.xml                     | 65 +++++++++++++++++++-------------------
 gateway-release/pom.xml       |  4 +--
 gateway-shell-release/pom.xml |  4 +--
 3 files changed, 36 insertions(+), 37 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/knox/blob/0edcb979/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index d7c73a3..5ea4d17 100644
--- a/build.xml
+++ b/build.xml
@@ -170,20 +170,20 @@ Release build file for the Apache Knox Gateway
         <mkdir dir="${candidate.dir}"/>
         <get username="${username}" password="${password}" dest="${candidate.dir}">
             <url url="${build-url}/knox-${gateway-version}.zip"/>
-            <url url="${build-url}/knox-${gateway-version}.zip.md5"/>
-            <url url="${build-url}/knox-${gateway-version}.zip.sha1"/>
+            <url url="${build-url}/knox-${gateway-version}.zip.sha256"/>
+            <url url="${build-url}/knox-${gateway-version}.zip.sha512"/>
             <url url="${build-url}/knox-${gateway-version}-src.zip"/>
-            <url url="${build-url}/knox-${gateway-version}-src.zip.md5"/>
-            <url url="${build-url}/knox-${gateway-version}-src.zip.sha1"/>
+            <url url="${build-url}/knox-${gateway-version}-src.zip.sha256"/>
+            <url url="${build-url}/knox-${gateway-version}-src.zip.sha512"/>
             <url url="${build-url}/knox-${gateway-version}.tar.gz"/>
-            <url url="${build-url}/knox-${gateway-version}.tar.gz.md5"/>
-            <url url="${build-url}/knox-${gateway-version}.tar.gz.sha1"/>
+            <url url="${build-url}/knox-${gateway-version}.tar.gz.sha256"/>
+            <url url="${build-url}/knox-${gateway-version}.tar.gz.sha512"/>
             <url url="${build-url}/${knoxshell-artifact}-${gateway-version}.zip"/>
-            <url url="${build-url}/${knoxshell-artifact}-${gateway-version}.zip.md5"/>
-            <url url="${build-url}/${knoxshell-artifact}-${gateway-version}.zip.sha1"/>
+            <url url="${build-url}/${knoxshell-artifact}-${gateway-version}.zip.sha256"/>
+            <url url="${build-url}/${knoxshell-artifact}-${gateway-version}.zip.sha512"/>
             <url url="${build-url}/${knoxshell-artifact}-${gateway-version}.tar.gz"/>
-            <url url="${build-url}/${knoxshell-artifact}-${gateway-version}.tar.gz.md5"/>
-            <url url="${build-url}/${knoxshell-artifact}-${gateway-version}.tar.gz.sha1"/>
+            <url url="${build-url}/${knoxshell-artifact}-${gateway-version}.tar.gz.sha256"/>
+            <url url="${build-url}/${knoxshell-artifact}-${gateway-version}.tar.gz.sha512"/>
             <url url="${build-url}/CHANGES"/>
         </get>
     </target>
@@ -192,24 +192,24 @@ Release build file for the Apache Knox Gateway
         <mkdir dir="${install.dir}"/>
         <get dest="${install.dir}" username="${username}" password="${password}">
             <url url="${svn.staging.path}/knox-${gateway-version}/knox-${gateway-version}.zip"/>
-            <url url="${svn.staging.path}/knox-${gateway-version}/knox-${gateway-version}.zip.md5"/>
-            <url url="${svn.staging.path}/knox-${gateway-version}/knox-${gateway-version}.zip.sha1"/>
+            <url url="${svn.staging.path}/knox-${gateway-version}/knox-${gateway-version}.zip.sha256"/>
+            <url url="${svn.staging.path}/knox-${gateway-version}/knox-${gateway-version}.zip.sha512"/>
             <url url="${svn.staging.path}/knox-${gateway-version}/knox-${gateway-version}.zip.asc"/>
             <url url="${svn.staging.path}/knox-${gateway-version}/knox-${gateway-version}-src.zip"/>
-            <url url="${svn.staging.path}/knox-${gateway-version}/knox-${gateway-version}-src.zip.md5"/>
-            <url url="${svn.staging.path}/knox-${gateway-version}/knox-${gateway-version}-src.zip.sha1"/>
+            <url url="${svn.staging.path}/knox-${gateway-version}/knox-${gateway-version}-src.zip.sha256"/>
+            <url url="${svn.staging.path}/knox-${gateway-version}/knox-${gateway-version}-src.zip.sha512"/>
             <url url="${svn.staging.path}/knox-${gateway-version}/knox-${gateway-version}-src.zip.asc"/>
             <url url="${svn.staging.path}/knox-${gateway-version}/knox-${gateway-version}.tar.gz"/>
-            <url url="${svn.staging.path}/knox-${gateway-version}/knox-${gateway-version}.tar.gz.md5"/>
-            <url url="${svn.staging.path}/knox-${gateway-version}/knox-${gateway-version}.tar.gz.sha1"/>
+            <url url="${svn.staging.path}/knox-${gateway-version}/knox-${gateway-version}.tar.gz.sha256"/>
+            <url url="${svn.staging.path}/knox-${gateway-version}/knox-${gateway-version}.tar.gz.sha512"/>
             <url url="${svn.staging.path}/knox-${gateway-version}/knox-${gateway-version}.tar.gz.asc"/>
             <url url="${svn.staging.path}/knox-${gateway-version}/${knoxshell-artifact}-${gateway-version}.zip"/>
-            <url url="${svn.staging.path}/knox-${gateway-version}/${knoxshell-artifact}-${gateway-version}.zip.md5"/>
-            <url url="${svn.staging.path}/knox-${gateway-version}/${knoxshell-artifact}-${gateway-version}.zip.sha1"/>
+            <url url="${svn.staging.path}/knox-${gateway-version}/${knoxshell-artifact}-${gateway-version}.zip.sha256"/>
+            <url url="${svn.staging.path}/knox-${gateway-version}/${knoxshell-artifact}-${gateway-version}.zip.sha512"/>
             <url url="${svn.staging.path}/knox-${gateway-version}/${knoxshell-artifact}-${gateway-version}.zip.asc"/>
             <url url="${svn.staging.path}/knox-${gateway-version}/${knoxshell-artifact}-${gateway-version}.tar.gz"/>
-            <url url="${svn.staging.path}/knox-${gateway-version}/${knoxshell-artifact}-${gateway-version}.tar.gz.md5"/>
-            <url url="${svn.staging.path}/knox-${gateway-version}/${knoxshell-artifact}-${gateway-version}.tar.gz.sha1"/>
+            <url url="${svn.staging.path}/knox-${gateway-version}/${knoxshell-artifact}-${gateway-version}.tar.gz.sha256"/>
+            <url url="${svn.staging.path}/knox-${gateway-version}/${knoxshell-artifact}-${gateway-version}.tar.gz.sha512"/>
             <url url="${svn.staging.path}/knox-${gateway-version}/${knoxshell-artifact}-${gateway-version}.tar.gz.asc"/>
             <url url="${svn.staging.path}/knox-${gateway-version}/CHANGES"/>
         </get>
@@ -221,31 +221,30 @@ Release build file for the Apache Knox Gateway
             <arg value="--verify"/>
             <arg value="${gateway-artifact}-${gateway-version}.zip.asc"/>
         </exec>
-        <checksum file="${install.dir}/${gateway-artifact}-${gateway-version}.zip" verifyproperty="zip.md5.ok"/>
-        <fail message="MD5 Invalid"><condition><isfalse value="${zip.md5.ok}"/></condition></fail>
-        <checksum file="${install.dir}/${gateway-artifact}-${gateway-version}.zip" algorithm="SHA1" verifyproperty="zip.sha.ok"/>
-        <fail message="SHA Invalid"><condition><isfalse value="${zip.sha.ok}"/></condition></fail>
+        <checksum file="${install.dir}/${gateway-artifact}-${gateway-version}.zip" algorithm="SHA-256" verifyproperty="zip.sha256.ok"/>
+        <fail message="SHA-256 Invalid"><condition><isfalse value="${zip.sha256.ok}"/></condition></fail>
+        <checksum file="${install.dir}/${gateway-artifact}-${gateway-version}.zip" algorithm="SHA-512" verifyproperty="zip.sha512.ok"/>
+        <fail message="SHA-512 Invalid"><condition><isfalse value="${zip.sha512.ok}"/></condition></fail>
 
         <echo>Verify ${gateway-artifact}-${gateway-version}-src.zip</echo>
         <exec executable="gpg" dir="${install.dir}" failonerror="true">
             <arg value="--verify"/>
             <arg value="${gateway-artifact}-${gateway-version}-src.zip.asc"/>
         </exec>
-        <checksum file="${install.dir}/${gateway-artifact}-${gateway-version}-src.zip" verifyproperty="src.md5.ok"/>
-        <fail message="MD5 Invalid"><condition><isfalse value="${src.md5.ok}"/></condition></fail>
-        <checksum file="${install.dir}/${gateway-artifact}-${gateway-version}-src.zip" algorithm="SHA1" verifyproperty="src.sha.ok"/>
-        <fail message="SHA Invalid"><condition><isfalse value="${src.sha.ok}"/></condition></fail>
+        <checksum file="${install.dir}/${gateway-artifact}-${gateway-version}-src.zip" algorithm="SHA-256" verifyproperty="src.sha256.ok"/>
+        <fail message="SHA-256 Invalid"><condition><isfalse value="${src.sha256.ok}"/></condition></fail>
+        <checksum file="${install.dir}/${gateway-artifact}-${gateway-version}-src.zip" algorithm="SHA-512" verifyproperty="src.sha512.ok"/>
+        <fail message="SHA-512 Invalid"><condition><isfalse value="${src.sha512.ok}"/></condition></fail>
 
         <echo>Verify ${gateway-artifact}-${gateway-version}.tar.gz</echo>
         <exec executable="gpg" dir="${install.dir}" failonerror="true">
             <arg value="--verify"/>
             <arg value="${gateway-artifact}-${gateway-version}.tar.gz.asc"/>
         </exec>
-        <checksum file="${install.dir}/${gateway-artifact}-${gateway-version}.tar.gz" verifyproperty="tar.md5.ok"/>
-        <fail message="MD5 Invalid"><condition><isfalse value="${tar.md5.ok}"/></condition></fail>
-        <checksum file="${install.dir}/${gateway-artifact}-${gateway-version}.tar.gz" algorithm="SHA1" verifyproperty="tar.sha.ok"/>
-        <fail message="SHA Invalid"><condition><isfalse value="${tar.sha.ok}"/></condition></fail>
-
+        <checksum file="${install.dir}/${gateway-artifact}-${gateway-version}.tar.gz" algorithm="SHA-256" verifyproperty="tar.sha256.ok"/>
+        <fail message="SHA-256 Invalid"><condition><isfalse value="${tar.sha256.ok}"/></condition></fail>
+        <checksum file="${install.dir}/${gateway-artifact}-${gateway-version}.tar.gz" algorithm="SHA-512" verifyproperty="tar.sha512.ok"/>
+        <fail message="SHA-512 Invalid"><condition><isfalse value="${tar.sha512.ok}"/></condition></fail>
     </target>
 
     <target name="sign-candidate" depends="_init,_passphrase" description="Sign a downloaded created release.">

http://git-wip-us.apache.org/repos/asf/knox/blob/0edcb979/gateway-release/pom.xml
----------------------------------------------------------------------
diff --git a/gateway-release/pom.xml b/gateway-release/pom.xml
index 659a8ed..788788b 100644
--- a/gateway-release/pom.xml
+++ b/gateway-release/pom.xml
@@ -62,13 +62,13 @@
                                 <goals><goal>run</goal></goals>
                                 <configuration>
                                     <tasks>
-                                        <checksum algorithm="MD5" fileext=".md5">
+                                        <checksum algorithm="SHA-256" fileext=".sha256">
                                             <fileset dir="../target/${project.version}">
                                                 <include name="*.zip" />
                                                 <include name="*.tar.gz" />
                                             </fileset>
                                         </checksum>
-                                        <checksum algorithm="SHA1" fileext=".sha1">
+                                        <checksum algorithm="SHA-512" fileext=".sha512">
                                             <fileset dir="../target/${project.version}">
                                                 <include name="*.zip" />
                                                 <include name="*.tar.gz" />

http://git-wip-us.apache.org/repos/asf/knox/blob/0edcb979/gateway-shell-release/pom.xml
----------------------------------------------------------------------
diff --git a/gateway-shell-release/pom.xml b/gateway-shell-release/pom.xml
index 264fd89..2b8a56b 100644
--- a/gateway-shell-release/pom.xml
+++ b/gateway-shell-release/pom.xml
@@ -86,13 +86,13 @@
                                 <goals><goal>run</goal></goals>
                                 <configuration>
                                     <tasks>
-                                        <checksum algorithm="MD5" fileext=".md5">
+                                        <checksum algorithm="SHA-256" fileext=".sha256">
                                             <fileset dir="../target/${project.version}">
                                                 <include name="knoxshell-${project.version}.zip" />
                                                 <include name="knoxshell-${project.version}.tar.gz" />
                                             </fileset>
                                         </checksum>
-                                        <checksum algorithm="SHA1" fileext=".sha1">
+                                        <checksum algorithm="SHA-512" fileext=".sha512">
                                             <fileset dir="../target/${project.version}">
                                                 <include name="knoxshell-${project.version}.zip" />
                                                 <include name="knoxshell-${project.version}.tar.gz" />