Merge pull request #59 from fpapon/release-apache
Remove snapshots from download page and update distribution urls to b…
diff --git a/download.html.vtl b/download.html.vtl
index f851756..2711023 100644
--- a/download.html.vtl
+++ b/download.html.vtl
@@ -55,9 +55,9 @@
<h3>Code Signatures</h3>
-<p>You may <a class="external-link" href="http://www.apache.org/dev/release-signing.html#verifying-signature">verify the
+<p>You may <a class="external-link" href="https://infra.apache.org/release-signing.html#verifying-signature">verify the
authenticity</a> of all artifacts below by using the PGP <a class="external-link"
- href="http://www.apache.org/dist/shiro/KEYS">KEYS</a>
+ href="https://downloads.apache.org/shiro/KEYS">KEYS</a>
file. </p>
<h3>Releases</h3>
@@ -72,16 +72,6 @@
<li><a href="#latestGit">${latestRelease} Git Source repository</a></li>
</ul>
</li>
- #if( $earlyRelease )
- <li>
- <a href="#early">Early Access Release (${earlyRelease})</a>
- <ul>
- <li><a href="#earlyBinary">${earlyRelease} Binary Distribution</a></li>
- <li><a href="#earlySource">${earlyRelease} Source Code Distribution</a></li>
- <li><a href="#earlyGit">${earlyRelease} Git Source repository</a></li>
- </ul>
- </li>
- #end
<li><a href="#previous">Previous Releases</a>
<ul>
@@ -139,11 +129,11 @@
<p>The source bundle requires JDK 1.8 and Maven 3.0.3+ to build:</p>
-<p><a class="external-link" href="http://www.apache.org/dyn/closer.cgi/shiro/${latestRelease}/shiro-root-${latestRelease}-source-release.zip">zip</a>
+<p><a class="external-link" href="https://downloads.apache.org/shiro/${latestRelease}/shiro-root-${latestRelease}-source-release.zip">zip</a>
(<a class="external-link"
- href="http://www.apache.org/dyn/closer.cgi/shiro/${latestRelease}/shiro-root-${latestRelease}-source-release.zip.asc">pgp</a>, <a
+ href="https://downloads.apache.org/shiro/${latestRelease}/shiro-root-${latestRelease}-source-release.zip.asc">pgp</a>, <a
class="external-link"
- href="http://www.apache.org/dyn/closer.cgi/shiro/${latestRelease}/shiro-root-${latestRelease}-source-release.zip.sha512">sha512</a>)
+ href="https://downloads.apache.org/${latestRelease}/shiro-root-${latestRelease}-source-release.zip.sha512">sha512</a>)
</p>
<h3><a name="latestGit"></a>${latestRelease} Git Source repository</h3>
@@ -155,39 +145,6 @@
</pre>
-<h2><a name="early"></a>Early Access Release (${earlyRelease})</h2>
-<h3><a name="earlyBinary"></a>${earlyRelease} Binary Distribution</h3>
-
-<p>Associated documentation can be found <a href="documentation.html" title="Documentation">here</a></p>
-
-<p>To download the files directly as one .jar file just click the link in the "Artifact" column. If you would like
- acquire Shiro through Maven, then please use the markup listed under "Maven Usage"</p>
-
-<p>
-</p>
-
-#artifactTable($shiro15xSnapshot)
-
-<h3><a name="earlySource"></a>${earlyRelease} Source Code Distribution</h3>
-
-<p>The source bundle requires JDK 1.8 and Maven 3.0.3+ to build:</p>
-
-<p><a class="external-link" href="http://www.apache.org/dyn/closer.cgi/shiro/${earlyRelease}/shiro-root-${earlyRelease}-source-release.zip">zip</a>
- (<a class="external-link"
- href="http://www.apache.org/dyn/closer.cgi/shiro/${earlyRelease}/shiro-root-${earlyRelease}-source-release.zip.asc">pgp</a>, <a
- class="external-link"
- href="http://www.apache.org/dyn/closer.cgi/shiro/${earlyRelease}/shiro-root-${earlyRelease}-source-release.zip.sha512">sha512</a>)
-</p>
-
-<h3><a name="earlyGit"></a>${earlyRelease} Git Source repository</h3>
-
-<p>The source can be cloned anonymously from Git with this command:</p>
-<pre><code style="bash">git clone https://github.com/apache/shiro.git
-git checkout shiro-root-${earlyRelease} -b shiro-root-${earlyRelease}
-</code>
-</pre>
-
-
<h2><a name="previous"></a>Previous Releases</h2>
<h3><a name="1.4.xBinary"></a>${shiro14x.version} Binary Distribution</h3>
@@ -206,13 +163,13 @@
<p>The source bundle requires JDK 1.6 and Maven 3.0.3+ to build:</p>
-<p><a class="external-link" href="http://www.apache.org/dyn/closer.cgi/shiro/${shiro14x.version}/shiro-root-${shiro14x.version}-source-release.zip">zip</a>
+<p><a class="external-link" href="https://downloads.apache.org/shiro/${shiro14x.version}/shiro-root-${shiro14x.version}-source-release.zip">zip</a>
(<a class="external-link"
- href="http://www.apache.org/dyn/closer.cgi/shiro/${shiro14x.version}/shiro-root-${shiro14x.version}-source-release.zip.asc">pgp</a>, <a
+ href="https://downloads.apache.org/shiro/${shiro14x.version}/shiro-root-${shiro14x.version}-source-release.zip.asc">pgp</a>, <a
class="external-link"
- href="http://www.apache.org/dyn/closer.cgi/shiro/${shiro14x.version}/shiro-root-${shiro14x.version}-source-release.zip.md5">md5</a>, <a
+ href="https://downloads.apache.org/shiro/${shiro14x.version}/shiro-root-${shiro14x.version}-source-release.zip.md5">md5</a>, <a
class="external-link"
- href="http://www.apache.org/dyn/closer.cgi/shiro/${shiro14x.version}/shiro-root-${shiro14x.version}-source-release.zip.sha512">sha512</a>)
+ href="https://downloads.apache.org/shiro/${shiro14x.version}/shiro-root-${shiro14x.version}-source-release.zip.sha512">sha512</a>)
</p>
<h3><a name="1.4.xGit"></a>${shiro14x.version} Git Source repository</h3>
@@ -238,13 +195,13 @@
<p>The source bundle requires JDK 1.6 and Maven 3.0.3+ to build:</p>
-<p><a class="external-link" href="http://www.apache.org/dyn/closer.cgi/shiro/${shiro13x.version}/shiro-root-${shiro13x.version}-source-release.zip">zip</a>
+<p><a class="external-link" href="https://downloads.apache.org/shiro/${shiro13x.version}/shiro-root-${shiro13x.version}-source-release.zip">zip</a>
(<a class="external-link"
- href="http://www.apache.org/dyn/closer.cgi/shiro/${shiro13x.version}/shiro-root-${shiro13x.version}-source-release.zip.asc">pgp</a>, <a
+ href="https://downloads.apache.org/shiro/${shiro13x.version}/shiro-root-${shiro13x.version}-source-release.zip.asc">pgp</a>, <a
class="external-link"
- href="http://www.apache.org/dyn/closer.cgi/shiro/${shiro13x.version}/shiro-root-${shiro13x.version}-source-release.zip.md5">md5</a>, <a
+ href="https://downloads.apache.org/shiro/${shiro13x.version}/shiro-root-${shiro13x.version}-source-release.zip.md5">md5</a>, <a
class="external-link"
- href="http://www.apache.org/dyn/closer.cgi/shiro/${shiro13x.version}/shiro-root-${shiro13x.version}-source-release.zip.sha1">sha1</a>)
+ href="https://downloads.apache.org/shiro/${shiro13x.version}/shiro-root-${shiro13x.version}-source-release.zip.sha1">sha1</a>)
</p>
<h3><a name="1.3.xGit"></a>${shiro13x.version} Git Source repository</h3>
@@ -270,13 +227,13 @@
<p>The source bundle requires JDK 1.6 and Maven 3.0.3+ to build:</p>
-<p><a class="external-link" href="http://www.apache.org/dyn/closer.cgi/shiro/${shiro12x.version}/shiro-root-${shiro12x.version}-source-release.zip">zip</a>
+<p><a class="external-link" href="https://downloads.apache.org/shiro/${shiro12x.version}/shiro-root-${shiro12x.version}-source-release.zip">zip</a>
(<a class="external-link"
- href="http://www.apache.org/dyn/closer.cgi/shiro/${shiro12x.version}/shiro-root-${shiro12x.version}-source-release.zip.asc">pgp</a>, <a
+ href="https://downloads.apache.org/shiro/${shiro12x.version}/shiro-root-${shiro12x.version}-source-release.zip.asc">pgp</a>, <a
class="external-link"
- href="http://www.apache.org/dyn/closer.cgi/shiro/${shiro12x.version}/shiro-root-${shiro12x.version}-source-release.zip.md5">md5</a>, <a
+ href="https://downloads.apache.org/shiro/${shiro12x.version}/shiro-root-${shiro12x.version}-source-release.zip.md5">md5</a>, <a
class="external-link"
- href="http://www.apache.org/dyn/closer.cgi/shiro/${shiro12x.version}/shiro-root-${shiro12x.version}-source-release.zip.sha1">sha1</a>)
+ href="https://downloads.apache.org/shiro/${shiro12x.version}/shiro-root-${shiro12x.version}-source-release.zip.sha1">sha1</a>)
</p>
<h3><a name="1.2.xGit"></a>${shiro12x.version} Git Source repository</h3>
@@ -306,10 +263,10 @@
<p>The ${shiro11x.version} source bundle requires JDK 1.5+ and Maven 2.2+ to build:</p>
<p><a class="external-link"
- href="http://archive.apache.org/dist/shiro/${shiro11x.version}/shiro-root-${shiro11x.version}-source-release.zip">zip</a> (<a
- class="external-link" href="http://archive.apache.org/dist/shiro/${shiro11x.version}/shiro-root-${shiro11x.version}-source-release.zip.asc">pgp</a>,
- <a class="external-link" href="http://archive.apache.org/dist/shiro/${shiro11x.version}/shiro-root-${shiro11x.version}-source-release.zip.md5">md5</a>,
- <a class="external-link" href="http://archive.apache.org/dist/shiro/${shiro11x.version}/shiro-root-${shiro11x.version}-source-release.zip.sha1">sha1</a>)
+ href="https://archive.apache.org/dist/shiro/${shiro11x.version}/shiro-root-${shiro11x.version}-source-release.zip">zip</a> (<a
+ class="external-link" href="https://archive.apache.org/dist/shiro/${shiro11x.version}/shiro-root-${shiro11x.version}-source-release.zip.asc">pgp</a>,
+ <a class="external-link" href="https://archive.apache.org/dist/shiro/${shiro11x.version}/shiro-root-${shiro11x.version}-source-release.zip.md5">md5</a>,
+ <a class="external-link" href="https://archive.apache.org/dist/shiro/${shiro11x.version}/shiro-root-${shiro11x.version}-source-release.zip.sha1">sha1</a>)
</p>
<h4><a name="1.1.0Git"></a>${shiro11x.version} Git Source repository</h4>
diff --git a/templates/versions.vtl b/templates/versions.vtl
index 09d3b97..8ea2d0b 100644
--- a/templates/versions.vtl
+++ b/templates/versions.vtl
@@ -1,8 +1,6 @@
#set( $latestRelease = "1.5.3" )
#set( $versionInfo = {"1.5.3": { "releaseDate": "2020-5-3" } } )
-#set( $earlyRelease = "1.5.4-SNAPSHOT" )
-
#set( $shiroCore = {"g":"org.apache.shiro", "a": "shiro-core", "type": "jar",
"description": 'Required in all environments. <a class="external-link" href="http://slf4j.org/">Slf4j</a>''s
<code>slf4j-api</code> jar and one of its binding jars is required. <code>commons-beanutils</code> is
@@ -138,23 +136,4 @@
$shiroHasher
]} )
-#set( $shiro15xSnapshot = {"version": $earlyRelease, "artifacts": [
- $shiroAll,
- $shiroCore,
- $shiroWeb,
- $shiroServletPlugin,
- $shiroJaxrs,
- $shiroAspectJ,
- $shiroCas,
- $shiroEhCache,
- $shiroHazelcast,
- $shiroFeatures,
- $shiroGuice,
- $shiroQuartz,
- $shiroSpring,
- $shiroSpringBoot,
- $shiroSpringBootWeb,
- $shiroHasher
-]} )
-
