Author: kiwiwings
Date: Sat Sep 8 21:23:19 2018
New Revision: 1840383
URL: http://svn.apache.org/viewvc?rev=1840383&view=rev
Log:
#62699 - Download page must link to https://www.apache.org/dist/poi/KEYS
Modified:
poi/site/src/documentation/content/xdocs/download.xml
poi/trunk/build.xml
Modified: poi/site/src/documentation/content/xdocs/download.xml
URL:
http://svn.apache.org/viewvc/poi/site/src/documentation/content/xdocs/download.xml?rev=1840383&r1=1840382&r2=1840383&view=diff
==============================================================================
--- poi/site/src/documentation/content/xdocs/download.xml (original)
+++ poi/site/src/documentation/content/xdocs/download.xml Sat Sep 8 21:23:19
2018
@@ -63,45 +63,33 @@
</p>
<section id="POI-4.0.0-bin"><title>Binary Distribution</title>
<ul>
- <li><a
href="https://www.apache.org/dyn/closer.lua/poi/release/bin/poi-bin-4.0.0-20180907.tar.gz";>poi-bin-4.0.0-20180907.tar.gz</a>
- (25.43 MB, <a
href="https://www.apache.org/dist/poi/release/bin/poi-bin-4.0.0-20180907.tar.gz.asc";>signature
(.asc)</a>)
- <br/>
- SHA256 checksum: <a
href="https://www.apache.org/dist/poi/release/bin/poi-bin-4.0.0-20180907.tar.gz.sha256";>
-
aebb0fae822158d9a190f34394ec1c89d054e111b510405db56cf6608886d997</a>
- <br/>
- SHA512 checksum: <a
href="https://www.apache.org/dist/poi/release/bin/poi-bin-4.0.0-20180907.tar.gz.sha512";>
-
5ac9608a63b563b000b17737aae9640e21975520ca659ecd7ebcd6543da8badd9feb37fd8b295a795fccbcf81eb2cac280f8ca572398597807797414d155ccc4</a>
+ <li>
+ <a
href="https://www.apache.org/dyn/closer.lua/poi/release/bin/poi-bin-4.0.0-20180907.tar.gz";>poi-bin-4.0.0-20180907.tar.gz</a>
+ (25.43 MB, <a
href="https://www.apache.org/dist/poi/release/bin/poi-bin-4.0.0-20180907.tar.gz.asc";>signature
(.asc)</a>,
+ checksum: <a
href="https://www.apache.org/dist/poi/release/bin/poi-bin-4.0.0-20180907.tar.gz.sha256";>SHA-256</a>,
+ <a
href="https://www.apache.org/dist/poi/release/bin/poi-bin-4.0.0-20180907.tar.gz.sha512";>SHA-512</a>)
</li>
- <li><a
href="https://www.apache.org/dyn/closer.lua/poi/release/bin/poi-bin-4.0.0-20180907.zip";>poi-bin-4.0.0-20180907.zip</a>
- (34.80 MB, <a
href="https://www.apache.org/dist/poi/release/bin/poi-bin-4.0.0-20180907.zip.asc";>signature
(.asc)</a>)
- <br/>
- SHA256 checksum: <a
href="https://www.apache.org/dist/poi/release/bin/poi-bin-4.0.0-20180907.zip.sha256";>
-
a1eb4334a16c0489d3e7afbb2cc71f02680b6427367bc6fb0098f3d3b88250fb</a>
- <br/>
- SHA512 checksum: <a
href="https://www.apache.org/dist/poi/release/bin/poi-bin-4.0.0-20180907.zip.sha512";>
-
096945b38935137151f409917cf76427fc242c2c9817acba35782eafcd1a8177112a4a2f9ad66b5bf715e6af1510f2254a3064c5610e8096711e3aaf344a8f38</a>
+ <li>
+ <a
href="https://www.apache.org/dyn/closer.lua/poi/release/bin/poi-bin-4.0.0-20180907.zip";>poi-bin-4.0.0-20180907.zip</a>
+ (34.80 MB, <a
href="https://www.apache.org/dist/poi/release/bin/poi-bin-4.0.0-20180907.zip.asc";>signature
(.asc)</a>,
+ checksum: <a
href="https://www.apache.org/dist/poi/release/bin/poi-bin-4.0.0-20180907.zip.sha256";>SHA-256</a>,
+ <a
href="https://www.apache.org/dist/poi/release/bin/poi-bin-4.0.0-20180907.zip.sha512";>SHA-512</a>)
</li>
</ul>
</section>
<section id="POI-4.0.0-src"><title>Source Distribution</title>
<ul>
- <li><a
href="https://www.apache.org/dyn/closer.lua/poi/release/src/poi-src-4.0.0-20180907.tar.gz";>poi-src-4.0.0-20180907.tar.gz</a>
- (92.35 MB, <a
href="https://www.apache.org/dist/poi/release/src/poi-src-4.0.0-20180907.tar.gz.asc";>signature
(.asc)</a>)
- <br/>
- SHA256 checksum: <a
href="https://www.apache.org/dist/poi/release/src/poi-src-4.0.0-20180907.tar.gz.sha256";>
-
3c046ff8259808b06e39df4d900edf5727e49dab3c15b88df8a2260ee75b2dda</a>
- <br/>
- SHA512 checksum: <a
href="https://www.apache.org/dist/poi/release/src/poi-src-4.0.0-20180907.tar.gz.sha512";>
-
67e9f4347e81279c5da662435870b8d6415d42e79349e97005fe9da15e5cb4bd0c4e153ae2c1dc665a1c312a24e817fbb2977bed730cf3e10c1d35de0d17def3</a>
+ <li>
+ <a
href="https://www.apache.org/dyn/closer.lua/poi/release/src/poi-src-4.0.0-20180907.tar.gz";>poi-src-4.0.0-20180907.tar.gz</a>
+ (92.35 MB, <a
href="https://www.apache.org/dist/poi/release/src/poi-src-4.0.0-20180907.tar.gz.asc";>signature
(.asc)</a>,
+ checksum: <a
href="https://www.apache.org/dist/poi/release/src/poi-src-4.0.0-20180907.tar.gz.sha256";>SHA-256</a>,
+ <a
href="https://www.apache.org/dist/poi/release/src/poi-src-4.0.0-20180907.tar.gz.sha512";>SHA-512</a>)
</li>
- <li><a
href="https://www.apache.org/dyn/closer.lua/poi/release/src/poi-src-4.0.0-20180907.zip";>poi-src-4.0.0-20180907.zip</a>
- (96.55 MB, <a
href="https://www.apache.org/dist/poi/release/src/poi-src-4.0.0-20180907.zip.asc";>signature
(.asc)</a>)
- <br/>
- SHA256 checksum: <a
href="https://www.apache.org/dist/poi/release/src/poi-src-4.0.0-20180907.zip.sha256";>
-
8749bd65bb07cb4bcc9dcd17dbd892454ebcae0b39fadb9ca5c73c423e40f4b1</a>
- <br/>
- SHA512 checksum: <a
href="https://www.apache.org/dist/poi/release/src/poi-src-4.0.0-20180907.zip.sha512";>
-
b8dee2fbb53a761c6f096a4e6ff309b4de69ad9d2fac8cfba56c910e0cfcff346e8cd03da182ddcc1474d8fdc5e4072b552fa4aef571a1adfc15576b4b972a33</a>
+ <li>
+ <a
href="https://www.apache.org/dyn/closer.lua/poi/release/src/poi-src-4.0.0-20180907.zip";>poi-src-4.0.0-20180907.zip</a>
+ (96.55 MB, <a
href="https://www.apache.org/dist/poi/release/src/poi-src-4.0.0-20180907.zip.asc";>signature
(.asc)</a>,
+ checksum: <a
href="https://www.apache.org/dist/poi/release/src/poi-src-4.0.0-20180907.zip.sha256";>SHA-256</a>,
+ <a
href="https://www.apache.org/dist/poi/release/src/poi-src-4.0.0-20180907.zip.sha512";>SHA-512</a>)
</li>
</ul>
</section>
@@ -127,7 +115,7 @@
</p>
<p>
The PGP signatures can be verified using PGP or GPG. First
- <a href="https://svn.apache.org/repos/asf/poi/trunk/KEYS";>download the
KEYS file</a>
+ <a href="https://www.apache.org/dist/poi/KEYS";>download the KEYS
file</a>
as well as the .asc signature files for the relevant release packages.
Make sure you get these files from the main distribution directory,
rather than from a mirror.
Then <a href="https://www.apache.org/info/verification.html";>verify
the signatures</a>.
Modified: poi/trunk/build.xml
URL:
http://svn.apache.org/viewvc/poi/trunk/build.xml?rev=1840383&r1=1840382&r2=1840383&view=diff
==============================================================================
--- poi/trunk/build.xml (original)
+++ poi/trunk/build.xml Sat Sep 8 21:23:19 2018
@@ -2753,13 +2753,20 @@ under the License.
project.setProperty(attributes.get("property"), mega);
</scriptdef>
- <macrodef name="loadFilesize">
- <attribute name="url"/>
- <attribute name="property"/>
+ <macrodef name="download-line">
+ <attribute name="prop"/>
+ <attribute name="dist"/>
+ <attribute name="pack"/>
<sequential>
+ <local name="baseurl"/>
+ <property name="baseurl"
value="https://www.apache.org/dist/poi/release"/>
+
+ <local name="basedyn"/>
+ <property name="basedyn"
value="https://www.apache.org/dyn/closer.lua/poi/release"/>
+
<delete file="build/loadFilesize.txt"/>
<record name="build/loadFilesize.txt" action="start"
loglevel="verbose" append="false"/>
- <http url="@{url}" method="HEAD" expected="200"
printrequestheaders="false" printresponseheaders="false"/>
+ <http
url="${baseurl}/@{dist}/poi-@{dist}-${version.id}-${file_date}.@{pack}"
method="HEAD" expected="200" printrequestheaders="false"
printresponseheaders="false"/>
<record name="build/loadFilesize.txt" action="stop"/>
<local name="fileSize"/>
<loadfile property="fileSize" srcFile="build/loadFilesize.txt">
@@ -2770,7 +2777,16 @@ under the License.
</tokenfilter>
</filterchain>
</loadfile>
- <bytes2mega property="@{property}" bytes="${fileSize}"/>
+
+ <local name="fileSizeMb"/>
+ <bytes2mega property="fileSizeMb" bytes="${fileSize}"/>
+
+ <property name="@{prop}"><![CDATA[<li>
+ <a
href="${basedyn}/@{dist}/poi-@{dist}-${version.id}-${file_date}.@{pack}">poi-@{dist}-${version.id}-${file_date}.@{pack}</a>
+ (${fileSizeMb} MB, <a
href="${baseurl}/@{dist}/poi-@{dist}-${version.id}-${file_date}.@{pack}.asc">signature
(.asc)</a>,
+ checksum: <a
href="${baseurl}/@{dist}/poi-@{dist}-${version.id}-${file_date}.@{pack}.sha256">SHA-256</a>,
+ <a
href="${baseurl}/@{dist}/poi-@{dist}-${version.id}-${file_date}.@{pack}.sha512">SHA-512</a>)
+ </li>]]></property>
</sequential>
</macrodef>
@@ -2795,23 +2811,17 @@ under the License.
<format property="rel_date" pattern="dd MMMM yyyy" locale="US"/>
<format property="file_date" pattern="yyyyMMdd" locale="US"/>
</tstamp>
- <property name="baseurl"
value="https://www.apache.org/dist/poi/release"/>
- <loadChecksum property="bin-tar-sha256"
url="${baseurl}/bin/poi-bin-${version.id}-${file_date}.tar.gz.sha256"/>
- <loadChecksum property="bin-tar-sha512"
url="${baseurl}/bin/poi-bin-${version.id}-${file_date}.tar.gz.sha512"/>
- <loadChecksum property="bin-zip-sha256"
url="${baseurl}/bin/poi-bin-${version.id}-${file_date}.zip.sha256"/>
- <loadChecksum property="bin-zip-sha512"
url="${baseurl}/bin/poi-bin-${version.id}-${file_date}.zip.sha512"/>
- <loadChecksum property="src-tar-sha256"
url="${baseurl}/src/poi-src-${version.id}-${file_date}.tar.gz.sha256"/>
- <loadChecksum property="src-tar-sha512"
url="${baseurl}/src/poi-src-${version.id}-${file_date}.tar.gz.sha512"/>
- <loadChecksum property="src-zip-sha256"
url="${baseurl}/src/poi-src-${version.id}-${file_date}.zip.sha256"/>
- <loadChecksum property="src-zip-sha512"
url="${baseurl}/src/poi-src-${version.id}-${file_date}.zip.sha512"/>
-
- <loadFilesize property="bin-tar-size"
url="${baseurl}/bin/poi-bin-${version.id}-${file_date}.tar.gz"/>
- <loadFilesize property="bin-zip-size"
url="${baseurl}/bin/poi-bin-${version.id}-${file_date}.zip"/>
- <loadFilesize property="src-tar-size"
url="${baseurl}/src/poi-src-${version.id}-${file_date}.tar.gz"/>
- <loadFilesize property="src-zip-size"
url="${baseurl}/src/poi-src-${version.id}-${file_date}.zip"/>
+ <local name="li1"/>
+ <local name="li2"/>
+ <local name="li3"/>
+ <local name="li4"/>
+ <download-line prop="li1" dist="bin" pack="tar.gz"/>
+ <download-line prop="li2" dist="bin" pack="zip"/>
+ <download-line prop="li3" dist="src" pack="tar.gz"/>
+ <download-line prop="li4" dist="src" pack="zip"/>
- <echo file="download-snipplet.xml"><![CDATA[
+<echo file="download-snipplet.xml"><![CDATA[
<section id="POI-${version.id}"><title>${rel_date} - POI ${version.id}
available</title>
<p>The Apache POI team is pleased to announce the release of
${version.id}.
Featured are a handful of new areas of functionality and numerous bug
fixes.</p>
@@ -2828,46 +2838,14 @@ under the License.
</p>
<section id="POI-${version.id}-bin"><title>Binary Distribution</title>
<ul>
- <li><a
href="https://www.apache.org/dyn/closer.lua/poi/release/bin/poi-bin-${version.id}-${file_date}.tar.gz";>poi-bin-${version.id}-${file_date}.tar.gz</a>
- (${bin-tar-size} MB, <a
href="https://www.apache.org/dist/poi/release/bin/poi-bin-${version.id}-${file_date}.tar.gz.asc";>signature
(.asc)</a>)
- <br/>
- SHA256 checksum: <a
href="https://www.apache.org/dist/poi/release/bin/poi-bin-${version.id}-${file_date}.tar.gz.sha256";>
- ${bin-tar-sha256}</a>
- <br/>
- SHA512 checksum: <a
href="https://www.apache.org/dist/poi/release/bin/poi-bin-${version.id}-${file_date}.tar.gz.sha512";>
- ${bin-tar-sha512}</a>
- </li>
- <li><a
href="https://www.apache.org/dyn/closer.lua/poi/release/bin/poi-bin-${version.id}-${file_date}.zip";>poi-bin-${version.id}-${file_date}.zip</a>
- (${bin-zip-size} MB, <a
href="https://www.apache.org/dist/poi/release/bin/poi-bin-${version.id}-${file_date}.zip.asc";>signature
(.asc)</a>)
- <br/>
- SHA256 checksum: <a
href="https://www.apache.org/dist/poi/release/bin/poi-bin-${version.id}-${file_date}.zip.sha256";>
- ${bin-zip-sha256}</a>
- <br/>
- SHA512 checksum: <a
href="https://www.apache.org/dist/poi/release/bin/poi-bin-${version.id}-${file_date}.zip.sha512";>
- ${bin-zip-sha512}</a>
- </li>
+ ${li1}
+ ${li2}
</ul>
</section>
<section id="POI-${version.id}-src"><title>Source Distribution</title>
<ul>
- <li><a
href="https://www.apache.org/dyn/closer.lua/poi/release/src/poi-src-${version.id}-${file_date}.tar.gz";>poi-src-${version.id}-${file_date}.tar.gz</a>
- (${src-tar-size} MB, <a
href="https://www.apache.org/dist/poi/release/src/poi-src-${version.id}-${file_date}.tar.gz.asc";>signature
(.asc)</a>)
- <br/>
- SHA256 checksum: <a
href="https://www.apache.org/dist/poi/release/src/poi-src-${version.id}-${file_date}.tar.gz.sha256";>
- ${src-tar-sha256}</a>
- <br/>
- SHA512 checksum: <a
href="https://www.apache.org/dist/poi/release/src/poi-src-${version.id}-${file_date}.tar.gz.sha512";>
- ${src-tar-sha512}</a>
- </li>
- <li><a
href="https://www.apache.org/dyn/closer.lua/poi/release/src/poi-src-${version.id}-${file_date}.zip";>poi-src-${version.id}-${file_date}.zip</a>
- (${src-zip-size} MB, <a
href="https://www.apache.org/dist/poi/release/src/poi-src-${version.id}-${file_date}.zip.asc";>signature
(.asc)</a>)
- <br/>
- SHA256 checksum: <a
href="https://www.apache.org/dist/poi/release/src/poi-src-${version.id}-${file_date}.zip.sha256";>
- ${src-zip-sha256}</a>
- <br/>
- SHA512 checksum: <a
href="https://www.apache.org/dist/poi/release/src/poi-src-${version.id}-${file_date}.zip.sha512";>
- ${src-zip-sha512}</a>
- </li>
+ ${li3}
+ ${li4}
</ul>
</section>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
