This is an automated email from the ASF dual-hosted git repository.
ecki pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-imaging.git
The following commit(s) were added to refs/heads/master by this push:
new 120ef1c [site] fix links in index and use https/sha256 for downloads.
120ef1c is described below
commit 120ef1c107e8641a4277b46997dd144bb851df5d
Author: Bernd Eckenfels <e...@apache.org>
AuthorDate: Wed Mar 13 00:50:56 2019 +0100
[site] fix links in index and use https/sha256 for downloads.
---
src/site/xdoc/download_imaging.xml | 50 ++++++++++++++++++++++++-------------
src/site/xdoc/download_sanselan.xml | 50 ++++++++++++++++++++++++-------------
src/site/xdoc/index.xml | 6 ++---
3 files changed, 69 insertions(+), 37 deletions(-)
diff --git a/src/site/xdoc/download_imaging.xml
b/src/site/xdoc/download_imaging.xml
index cab25df..8bb1977 100644
--- a/src/site/xdoc/download_imaging.xml
+++ b/src/site/xdoc/download_imaging.xml
@@ -31,10 +31,21 @@ limitations under the License.
| 2) Set the following properties in the component's pom: |
| - 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.2/3.version (conditional) |
+ | - commons.release.2/3.name (conditional) |
+ | - commons.release.2/3.binary.suffix (optional) |
+ | - commons.release.2/3.desc (optional) |
+ | - commons.release.2/3.subdir (optional) |
| |
| 3) Example Properties |
+ | (commons.release.name inherited by parent: |
+ | ${project.artifactId}-${commons.release.version} |
| |
| <properties> |
| <commons.componentid>math</commons.componentid> |
@@ -46,17 +57,17 @@ limitations under the License.
<document>
<properties>
<title>Download Apache Commons Imaging</title>
- <author email="d...@commons.apache.org">Commons Documentation Team</author>
+ <author email="d...@commons.apache.org">Apache Commons Documentation
Team</author>
</properties>
<body>
<section name="Download Apache Commons Imaging">
<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,10 +99,15 @@ limitations under the License.
</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>
@@ -100,13 +116,13 @@ limitations under the License.
<table>
<tr>
<td><a
href="[preferred]/commons/imaging/binaries/commons-imaging-1.0-bin.tar.gz">commons-imaging-1.0-bin.tar.gz</a></td>
- <td><a
href="http://www.apache.org/dist/commons/imaging/binaries/commons-imaging-1.0-bin.tar.gz.md5";>md5</a></td>
- <td><a
href="http://www.apache.org/dist/commons/imaging/binaries/commons-imaging-1.0-bin.tar.gz.asc";>pgp</a></td>
+ <td><a
href="https://www.apache.org/dist/commons/imaging/binaries/commons-imaging-1.0-bin.tar.gz.sha256";>sha256</a></td>
+ <td><a
href="https://www.apache.org/dist/commons/imaging/binaries/commons-imaging-1.0-bin.tar.gz.asc";>pgp</a></td>
</tr>
<tr>
<td><a
href="[preferred]/commons/imaging/binaries/commons-imaging-1.0-bin.zip">commons-imaging-1.0-bin.zip</a></td>
- <td><a
href="http://www.apache.org/dist/commons/imaging/binaries/commons-imaging-1.0-bin.zip.md5";>md5</a></td>
- <td><a
href="http://www.apache.org/dist/commons/imaging/binaries/commons-imaging-1.0-bin.zip.asc";>pgp</a></td>
+ <td><a
href="https://www.apache.org/dist/commons/imaging/binaries/commons-imaging-1.0-bin.zip.sha256";>sha256</a></td>
+ <td><a
href="https://www.apache.org/dist/commons/imaging/binaries/commons-imaging-1.0-bin.zip.asc";>pgp</a></td>
</tr>
</table>
</subsection>
@@ -114,13 +130,13 @@ limitations under the License.
<table>
<tr>
<td><a
href="[preferred]/commons/imaging/source/commons-imaging-1.0-src.tar.gz">commons-imaging-1.0-src.tar.gz</a></td>
- <td><a
href="http://www.apache.org/dist/commons/imaging/source/commons-imaging-1.0-src.tar.gz.md5";>md5</a></td>
- <td><a
href="http://www.apache.org/dist/commons/imaging/source/commons-imaging-1.0-src.tar.gz.asc";>pgp</a></td>
+ <td><a
href="https://www.apache.org/dist/commons/imaging/source/commons-imaging-1.0-src.tar.gz.sha256";>sha256</a></td>
+ <td><a
href="https://www.apache.org/dist/commons/imaging/source/commons-imaging-1.0-src.tar.gz.asc";>pgp</a></td>
</tr>
<tr>
<td><a
href="[preferred]/commons/imaging/source/commons-imaging-1.0-src.zip">commons-imaging-1.0-src.zip</a></td>
- <td><a
href="http://www.apache.org/dist/commons/imaging/source/commons-imaging-1.0-src.zip.md5";>md5</a></td>
- <td><a
href="http://www.apache.org/dist/commons/imaging/source/commons-imaging-1.0-src.zip.asc";>pgp</a></td>
+ <td><a
href="https://www.apache.org/dist/commons/imaging/source/commons-imaging-1.0-src.zip.sha256";>sha256</a></td>
+ <td><a
href="https://www.apache.org/dist/commons/imaging/source/commons-imaging-1.0-src.zip.asc";>pgp</a></td>
</tr>
</table>
</subsection>
@@ -131,7 +147,7 @@ limitations under the License.
</p>
<ul>
<li class="download"><a href="[preferred]/commons/imaging/">browse
download area</a></li>
- <li><a
href="http://archive.apache.org/dist/commons/imaging/";>archives...</a></li>
+ <li><a
href="https://archive.apache.org/dist/commons/imaging/";>archives...</a></li>
</ul>
</section>
</body>
diff --git a/src/site/xdoc/download_sanselan.xml
b/src/site/xdoc/download_sanselan.xml
index 3ffca78..79df1fa 100644
--- a/src/site/xdoc/download_sanselan.xml
+++ b/src/site/xdoc/download_sanselan.xml
@@ -31,10 +31,21 @@ limitations under the License.
| 2) Set the following properties in the component's pom: |
| - 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.2/3.version (conditional) |
+ | - commons.release.2/3.name (conditional) |
+ | - commons.release.2/3.binary.suffix (optional) |
+ | - commons.release.2/3.desc (optional) |
+ | - commons.release.2/3.subdir (optional) |
| |
| 3) Example Properties |
+ | (commons.release.name inherited by parent: |
+ | ${project.artifactId}-${commons.release.version} |
| |
| <properties> |
| <commons.componentid>math</commons.componentid> |
@@ -46,17 +57,17 @@ limitations under the License.
<document>
<properties>
<title>Download Apache Commons Imaging</title>
- <author email="d...@commons.apache.org">Commons Documentation Team</author>
+ <author email="d...@commons.apache.org">Apache Commons Documentation
Team</author>
</properties>
<body>
<section name="Download Apache Commons Imaging">
<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,10 +99,15 @@ limitations under the License.
</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>
@@ -100,13 +116,13 @@ limitations under the License.
<table>
<tr>
<td><a
href="[preferred]/commons/sanselan/binaries/apache-sanselan-incubating-0.97-bin.tar.gz">apache-sanselan-incubating-0.97-bin.tar.gz</a></td>
- <td><a
href="http://www.apache.org/dist/commons/sanselan/binaries/apache-sanselan-incubating-0.97-bin.tar.gz.md5";>md5</a></td>
- <td><a
href="http://www.apache.org/dist/commons/sanselan/binaries/apache-sanselan-incubating-0.97-bin.tar.gz.asc";>pgp</a></td>
+ <td><a
href="https://www.apache.org/dist/commons/sanselan/binaries/apache-sanselan-incubating-0.97-bin.tar.gz.sha256";>sha256</a></td>
+ <td><a
href="https://www.apache.org/dist/commons/sanselan/binaries/apache-sanselan-incubating-0.97-bin.tar.gz.asc";>pgp</a></td>
</tr>
<tr>
<td><a
href="[preferred]/commons/sanselan/binaries/apache-sanselan-incubating-0.97-bin.zip">apache-sanselan-incubating-0.97-bin.zip</a></td>
- <td><a
href="http://www.apache.org/dist/commons/sanselan/binaries/apache-sanselan-incubating-0.97-bin.zip.md5";>md5</a></td>
- <td><a
href="http://www.apache.org/dist/commons/sanselan/binaries/apache-sanselan-incubating-0.97-bin.zip.asc";>pgp</a></td>
+ <td><a
href="https://www.apache.org/dist/commons/sanselan/binaries/apache-sanselan-incubating-0.97-bin.zip.sha256";>sha256</a></td>
+ <td><a
href="https://www.apache.org/dist/commons/sanselan/binaries/apache-sanselan-incubating-0.97-bin.zip.asc";>pgp</a></td>
</tr>
</table>
</subsection>
@@ -114,13 +130,13 @@ limitations under the License.
<table>
<tr>
<td><a
href="[preferred]/commons/sanselan/source/apache-sanselan-incubating-0.97-src.tar.gz">apache-sanselan-incubating-0.97-src.tar.gz</a></td>
- <td><a
href="http://www.apache.org/dist/commons/sanselan/source/apache-sanselan-incubating-0.97-src.tar.gz.md5";>md5</a></td>
- <td><a
href="http://www.apache.org/dist/commons/sanselan/source/apache-sanselan-incubating-0.97-src.tar.gz.asc";>pgp</a></td>
+ <td><a
href="https://www.apache.org/dist/commons/sanselan/source/apache-sanselan-incubating-0.97-src.tar.gz.sha256";>sha256</a></td>
+ <td><a
href="https://www.apache.org/dist/commons/sanselan/source/apache-sanselan-incubating-0.97-src.tar.gz.asc";>pgp</a></td>
</tr>
<tr>
<td><a
href="[preferred]/commons/sanselan/source/apache-sanselan-incubating-0.97-src.zip">apache-sanselan-incubating-0.97-src.zip</a></td>
- <td><a
href="http://www.apache.org/dist/commons/sanselan/source/apache-sanselan-incubating-0.97-src.zip.md5";>md5</a></td>
- <td><a
href="http://www.apache.org/dist/commons/sanselan/source/apache-sanselan-incubating-0.97-src.zip.asc";>pgp</a></td>
+ <td><a
href="https://www.apache.org/dist/commons/sanselan/source/apache-sanselan-incubating-0.97-src.zip.sha256";>sha256</a></td>
+ <td><a
href="https://www.apache.org/dist/commons/sanselan/source/apache-sanselan-incubating-0.97-src.zip.asc";>pgp</a></td>
</tr>
</table>
</subsection>
@@ -131,7 +147,7 @@ limitations under the License.
</p>
<ul>
<li class="download"><a href="[preferred]/commons/sanselan/">browse
download area</a></li>
- <li><a
href="http://archive.apache.org/dist/commons/sanselan/";>archives...</a></li>
+ <li><a
href="https://archive.apache.org/dist/commons/sanselan/";>archives...</a></li>
</ul>
</section>
</body>
diff --git a/src/site/xdoc/index.xml b/src/site/xdoc/index.xml
index 179a043..9c32b94 100644
--- a/src/site/xdoc/index.xml
+++ b/src/site/xdoc/index.xml
@@ -69,8 +69,8 @@
<li>Older releases - see the <a href="history.html">Release
History</a> page</li>
</ul>
<p>
- The <a href="scm.html">git repository</a> can be
- <a
href="https://git-wip-us.apache.org/repos/asf?p=commons-imaging.git";>browsed</a>,
or you can browse/contribute via <a
href="https://github.com/apache/commons-imaging";>GitHub</a>.
+ The <a href="source-repository.html">source repository</a> can be
+ <a
href="https://gitbox.apache.org/repos/asf?p=commons-imaging.git";>browsed</a>,
or you can browse/contribute via <a
href="https://github.com/apache/commons-imaging";>GitHub</a>.
</p>
</section>
<!-- ================================================== -->
@@ -87,7 +87,7 @@
</subsection>
<p>
- For information on previous releases see the <a
href="release-history.html">Release History</a>, and to download previous
releases see the <a
href="http://archive.apache.org/dist/commons/sanselan/";>Commons Sanselan
Archive</a>.
+ For information on previous releases see the <a
href="history.html">Release History</a>, and to download previous releases see
the <a href="http://archive.apache.org/dist/commons/sanselan/";>Commons Sanselan
Archive</a>.
</p>
</section>
<!-- ================================================== -->
