You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by se...@apache.org on 2019/08/06 15:55:23 UTC

[commons-dbcp] branch master updated: Fix up pom hash types and binary suffix

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-dbcp.git


The following commit(s) were added to refs/heads/master by this push:
     new e91f8b7  Fix up pom hash types and binary suffix
e91f8b7 is described below

commit e91f8b79788b70da825b74c5db295efe4095cf62
Author: Sebb <se...@apache.org>
AuthorDate: Tue Aug 6 16:55:15 2019 +0100

    Fix up pom hash types and binary suffix
---
 pom.xml                         |  6 ++++++
 src/site/xdoc/download_dbcp.xml | 26 +++++++++++++-------------
 2 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/pom.xml b/pom.xml
index 35eb0ff..7f79f86 100644
--- a/pom.xml
+++ b/pom.xml
@@ -295,19 +295,25 @@
     
     <commons.release.version>2.7.0</commons.release.version>
     <commons.release.desc>for JDBC 4.2 on Java 8</commons.release.desc>
+    <commons.release.hash>sha512</commons.release.hash>
     
     <commons.release.2.version>2.4.0</commons.release.2.version>
     <commons.release.2.desc>for JDBC 4.1 on Java 7</commons.release.2.desc>
+    <commons.release.2.hash>sha256</commons.release.2.hash>
     
     <!-- override parent name, because 1.x uses different artifactId -->
     <commons.release.3.name>commons-dbcp-${commons.release.3.version}</commons.release.3.name>
     <commons.release.3.version>1.4</commons.release.3.version>
     <commons.release.3.desc>for JDBC 4 on Java 6</commons.release.3.desc>
+    <commons.release.3.hash>sha256</commons.release.3.hash>
     
     <!-- override parent name, because 1.x uses different artifactId -->
     <commons.release.4.name>commons-dbcp-${commons.release.4.version}</commons.release.4.name>
     <commons.release.4.version>1.3</commons.release.4.version>
     <commons.release.4.desc>for JDBC 3 on Java 1.4 or 5</commons.release.4.desc>
+    <commons.release.4.hash>sha256</commons.release.4.hash>
+    <!-- Not sure why this is needed - issue with commons-build? -->
+    <commons.release.4.binary.suffix>-bin</commons.release.4.binary.suffix>
     
     <commons.site.path>dbcp</commons.site.path>
     <commons.scmPubUrl>https://svn.apache.org/repos/infra/websites/production/commons/content/proper/commons-dbcp</commons.scmPubUrl>
diff --git a/src/site/xdoc/download_dbcp.xml b/src/site/xdoc/download_dbcp.xml
index d04be09..3cf9db9 100644
--- a/src/site/xdoc/download_dbcp.xml
+++ b/src/site/xdoc/download_dbcp.xml
@@ -36,14 +36,14 @@ limitations under the License.
  |      (defaults to "-bin", set to "" for pre-maven2 releases)         |
  |    - commons.release.desc    (optional)                              |
  |    - commons.release.subdir  (optional)                              |
- |    - commons.release.hash    (optional, lowercase, default sha256)   |
+ |    - commons.release.hash    (optional, lowercase, default sha512)   |
  |                                                                      |
  |    - commons.release.[234].version       (conditional)               |
  |    - commons.release.[234].name          (conditional)               |
  |    - commons.release.[234].binary.suffix (optional)                  |
  |    - commons.release.[234].desc          (optional)                  |
  |    - commons.release.[234].subdir        (optional)                  |
- |    - commons.release.[234].hash       (optional, lowercase, [sha256])|
+ |    - commons.release.[234].hash       (optional, lowercase, [sha512])|
  |                                                                      |
  | 3) Example Properties                                                |
  |    (commons.release.name inherited by parent:                        |
@@ -104,7 +104,7 @@ limitations under the License.
         It is essential that you
         <a href="https://www.apache.org/info/verification.html">verify the integrity</a>
         of downloaded files, preferably using the <code>PGP</code> signature (<code>*.asc</code> files);
-        failing that using the <code>SHA256</code> hash (<code>*.sha256</code> checksum files).
+        failing that using the <code>SHA512</code> hash (<code>*.sha512</code> checksum files).
       </p>
       <p>
         The <a href="https://www.apache.org/dist/commons/KEYS">KEYS</a>
@@ -118,12 +118,12 @@ limitations under the License.
         <table>
           <tr>
               <td><a href="[preferred]/commons/dbcp/binaries/commons-dbcp2-2.7.0-bin.tar.gz">commons-dbcp2-2.7.0-bin.tar.gz</a></td>
-              <td><a href="https://www.apache.org/dist/commons/dbcp/binaries/commons-dbcp2-2.7.0-bin.tar.gz.sha256">sha256</a></td>
+              <td><a href="https://www.apache.org/dist/commons/dbcp/binaries/commons-dbcp2-2.7.0-bin.tar.gz.sha512">sha512</a></td>
               <td><a href="https://www.apache.org/dist/commons/dbcp/binaries/commons-dbcp2-2.7.0-bin.tar.gz.asc">pgp</a></td>
           </tr>
           <tr>
               <td><a href="[preferred]/commons/dbcp/binaries/commons-dbcp2-2.7.0-bin.zip">commons-dbcp2-2.7.0-bin.zip</a></td>
-              <td><a href="https://www.apache.org/dist/commons/dbcp/binaries/commons-dbcp2-2.7.0-bin.zip.sha256">sha256</a></td>
+              <td><a href="https://www.apache.org/dist/commons/dbcp/binaries/commons-dbcp2-2.7.0-bin.zip.sha512">sha512</a></td>
               <td><a href="https://www.apache.org/dist/commons/dbcp/binaries/commons-dbcp2-2.7.0-bin.zip.asc">pgp</a></td>
           </tr>
         </table>
@@ -132,12 +132,12 @@ limitations under the License.
         <table>
           <tr>
               <td><a href="[preferred]/commons/dbcp/source/commons-dbcp2-2.7.0-src.tar.gz">commons-dbcp2-2.7.0-src.tar.gz</a></td>
-              <td><a href="https://www.apache.org/dist/commons/dbcp/source/commons-dbcp2-2.7.0-src.tar.gz.sha256">sha256</a></td>
+              <td><a href="https://www.apache.org/dist/commons/dbcp/source/commons-dbcp2-2.7.0-src.tar.gz.sha512">sha512</a></td>
               <td><a href="https://www.apache.org/dist/commons/dbcp/source/commons-dbcp2-2.7.0-src.tar.gz.asc">pgp</a></td>
           </tr>
           <tr>
               <td><a href="[preferred]/commons/dbcp/source/commons-dbcp2-2.7.0-src.zip">commons-dbcp2-2.7.0-src.zip</a></td>
-              <td><a href="https://www.apache.org/dist/commons/dbcp/source/commons-dbcp2-2.7.0-src.zip.sha256">sha256</a></td>
+              <td><a href="https://www.apache.org/dist/commons/dbcp/source/commons-dbcp2-2.7.0-src.zip.sha512">sha512</a></td>
               <td><a href="https://www.apache.org/dist/commons/dbcp/source/commons-dbcp2-2.7.0-src.zip.asc">pgp</a></td>
           </tr>
         </table>
@@ -207,14 +207,14 @@ limitations under the License.
       <subsection name="Binaries">
         <table>
           <tr>
-              <td><a href="[preferred]/commons/dbcp/binaries/commons-dbcp-1.3${commons.release.4.binary.suffix}.tar.gz">commons-dbcp-1.3${commons.release.4.binary.suffix}.tar.gz</a></td>
-              <td><a href="https://www.apache.org/dist/commons/dbcp/binaries/commons-dbcp-1.3${commons.release.4.binary.suffix}.tar.gz.sha256">sha256</a></td>
-              <td><a href="https://www.apache.org/dist/commons/dbcp/binaries/commons-dbcp-1.3${commons.release.4.binary.suffix}.tar.gz.asc">pgp</a></td>
+              <td><a href="[preferred]/commons/dbcp/binaries/commons-dbcp-1.3-bin.tar.gz">commons-dbcp-1.3-bin.tar.gz</a></td>
+              <td><a href="https://www.apache.org/dist/commons/dbcp/binaries/commons-dbcp-1.3-bin.tar.gz.sha256">sha256</a></td>
+              <td><a href="https://www.apache.org/dist/commons/dbcp/binaries/commons-dbcp-1.3-bin.tar.gz.asc">pgp</a></td>
           </tr>
           <tr>
-              <td><a href="[preferred]/commons/dbcp/binaries/commons-dbcp-1.3${commons.release.4.binary.suffix}.zip">commons-dbcp-1.3${commons.release.4.binary.suffix}.zip</a></td>
-              <td><a href="https://www.apache.org/dist/commons/dbcp/binaries/commons-dbcp-1.3${commons.release.4.binary.suffix}.zip.sha256">sha256</a></td>
-              <td><a href="https://www.apache.org/dist/commons/dbcp/binaries/commons-dbcp-1.3${commons.release.4.binary.suffix}.zip.asc">pgp</a></td>
+              <td><a href="[preferred]/commons/dbcp/binaries/commons-dbcp-1.3-bin.zip">commons-dbcp-1.3-bin.zip</a></td>
+              <td><a href="https://www.apache.org/dist/commons/dbcp/binaries/commons-dbcp-1.3-bin.zip.sha256">sha256</a></td>
+              <td><a href="https://www.apache.org/dist/commons/dbcp/binaries/commons-dbcp-1.3-bin.zip.asc">pgp</a></td>
           </tr>
         </table>
       </subsection>