Fix up download source page Command used: mvn org.apache.commons:commons-build-plugin:1.10-SNAPSHOT:download-page -Dcommons.release.version=1.1.0 git-svn-id: https://svn.apache.org/repos/asf/commons/proper/daemon/trunk@1848392 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/site/xdoc/download_daemon.xml b/src/site/xdoc/download_daemon.xml index 532a827..a1eb0ad 100644 --- a/src/site/xdoc/download_daemon.xml +++ b/src/site/xdoc/download_daemon.xml
@@ -26,15 +26,28 @@ | commons-build-plugin/trunk/src/main/resources/commons-xdoc-templates | +======================================================================+ | | - | 1) Re-generate using: mvn commons:download-page | + | 1) Re-generate using: mvn commons-build:download-page | | | | 2) Set the following properties in the component's pom: | - | - commons.componentid (required, alphabetic, lower case) | + | - commons.componentid (required, alphabetic, lower case) | | - commons.release.version (required) | - | - commons.binary.suffix (optional) | + | - commons.release.name (required) | + | - commons.binary.suffix (optional) | | (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.[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])| | | | 3) Example Properties | + | (commons.release.name inherited by parent: | + | ${project.artifactId}-${commons.release.version} | | | | <properties> | | <commons.componentid>math</commons.componentid> | @@ -45,18 +58,18 @@ --> <document> <properties> - <title>Download Commons Daemon</title> - <author email="dev@commons.apache.org">Commons Documentation Team</author> + <title>Download Apache Commons Daemon</title> + <author email="dev@commons.apache.org">Apache Commons Documentation Team</author> </properties> <body> - <section name="Download Commons Daemon"> + <section name="Download Apache Commons Daemon"> <subsection name="Using a Mirror"> <p> We recommend you use a mirror to download our release - builds, but you <strong>must</strong> verify the integrity of + builds, but you <strong>must</strong> <a href="http://www.apache.org/info/verification.html">verify the integrity</a> of the downloaded files using signatures downloaded from our main distribution directories. Recent releases (48 hours) may not yet - be available from the mirrors. + be available from all the mirrors. </p> <p> @@ -88,30 +101,30 @@ </form> <p> - The <a href="http://www.apache.org/dist/commons/KEYS">KEYS</a> - link links to the code signing keys used to sign the product. - The <code>PGP</code> link downloads the OpenPGP compatible signature from our main site. - The <code>MD5</code> link downloads the checksum from the main site. + 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). + </p> + <p> + The <a href="https://www.apache.org/dist/commons/KEYS">KEYS</a> + file contains the public PGP keys used by Apache Commons developers + to sign releases. </p> </subsection> </section> - <section name="Commons Daemon 1.1.0"> + <section name="Apache Commons Daemon 1.1.0"> <subsection name="Binaries"> <table> <tr> <td><a href="[preferred]/commons/daemon/binaries/commons-daemon-1.1.0-bin.tar.gz">commons-daemon-1.1.0-bin.tar.gz</a></td> - <td><a href="http://www.apache.org/dist/commons/daemon/binaries/commons-daemon-1.1.0-bin.tar.gz.md5">md5</a></td> - <td><a href="http://www.apache.org/dist/commons/daemon/binaries/commons-daemon-1.1.0-bin.tar.gz.asc">pgp</a></td> + <td><a href="https://www.apache.org/dist/commons/daemon/binaries/commons-daemon-1.1.0-bin.tar.gz.sha256">sha256</a></td> + <td><a href="https://www.apache.org/dist/commons/daemon/binaries/commons-daemon-1.1.0-bin.tar.gz.asc">pgp</a></td> </tr> <tr> <td><a href="[preferred]/commons/daemon/binaries/commons-daemon-1.1.0-bin.zip">commons-daemon-1.1.0-bin.zip</a></td> - <td><a href="http://www.apache.org/dist/commons/daemon/binaries/commons-daemon-1.1.0-bin.zip.md5">md5</a></td> - <td><a href="http://www.apache.org/dist/commons/daemon/binaries/commons-daemon-1.1.0-bin.zip.asc">pgp</a></td> - </tr> - <tr> - <td><a href="[preferred]/commons/daemon/binaries/">Browse native binaries download area...</a></td> - <td></td> - <td></td> + <td><a href="https://www.apache.org/dist/commons/daemon/binaries/commons-daemon-1.1.0-bin.zip.sha256">sha256</a></td> + <td><a href="https://www.apache.org/dist/commons/daemon/binaries/commons-daemon-1.1.0-bin.zip.asc">pgp</a></td> </tr> </table> </subsection> @@ -119,23 +132,13 @@ <table> <tr> <td><a href="[preferred]/commons/daemon/source/commons-daemon-1.1.0-src.tar.gz">commons-daemon-1.1.0-src.tar.gz</a></td> - <td><a href="http://www.apache.org/dist/commons/daemon/source/commons-daemon-1.1.0-src.tar.gz.md5">md5</a></td> - <td><a href="http://www.apache.org/dist/commons/daemon/source/commons-daemon-1.1.0-src.tar.gz.asc">pgp</a></td> + <td><a href="https://www.apache.org/dist/commons/daemon/source/commons-daemon-1.1.0-src.tar.gz.sha256">sha256</a></td> + <td><a href="https://www.apache.org/dist/commons/daemon/source/commons-daemon-1.1.0-src.tar.gz.asc">pgp</a></td> </tr> <tr> <td><a href="[preferred]/commons/daemon/source/commons-daemon-1.1.0-src.zip">commons-daemon-1.1.0-src.zip</a></td> - <td><a href="http://www.apache.org/dist/commons/daemon/source/commons-daemon-1.1.0-src.zip.md5">md5</a></td> - <td><a href="http://www.apache.org/dist/commons/daemon/source/commons-daemon-1.1.0-src.zip.asc">pgp</a></td> - </tr> - <tr> - <td><a href="[preferred]/commons/daemon/source/commons-daemon-1.1.0-native-src.tar.gz">commons-daemon-1.1.0-native-src.tar.gz</a></td> - <td><a href="http://www.apache.org/dist/commons/daemon/source/commons-daemon-1.1.0-native-src.tar.gz.md5">md5</a></td> - <td><a href="http://www.apache.org/dist/commons/daemon/source/commons-daemon-1.1.0-native-src.tar.gz.asc">pgp</a></td> - </tr> - <tr> - <td><a href="[preferred]/commons/daemon/source/commons-daemon-1.1.0-native-src.zip">commons-daemon-1.1.0-native-src.zip</a></td> - <td><a href="http://www.apache.org/dist/commons/daemon/source/commons-daemon-1.1.0-native-src.zip.md5">md5</a></td> - <td><a href="http://www.apache.org/dist/commons/daemon/source/commons-daemon-1.1.0-native-src.zip.asc">pgp</a></td> + <td><a href="https://www.apache.org/dist/commons/daemon/source/commons-daemon-1.1.0-src.zip.sha256">sha256</a></td> + <td><a href="https://www.apache.org/dist/commons/daemon/source/commons-daemon-1.1.0-src.zip.asc">pgp</a></td> </tr> </table> </subsection> @@ -145,8 +148,8 @@ Older releases can be obtained from the archives. </p> <ul> - <li class="download"><a href="[preferred]/commons/daemon/">Browse download area...</a></li> - <li><a href="http://archive.apache.org/dist/commons/daemon/">Archives...</a></li> + <li class="download"><a href="[preferred]/commons/daemon/">browse download area</a></li> + <li><a href="https://archive.apache.org/dist/commons/daemon/">archives...</a></li> </ul> </section> </body>