Merge pull request #86 from apache/mailing-lists-no-nabble

Remove nabble mailing list archive links
diff --git a/download.html.vtl b/download.html.vtl
index 871783a..f9885a0 100644
--- a/download.html.vtl
+++ b/download.html.vtl
@@ -78,6 +78,14 @@
 
         <li><a href="#previous">Previous Releases</a>
             <ul>
+                <li><a href="#1.7.x">$shiro17x.version</a></li>
+                <ul>
+                    <li><a href="#1.7.xBinary">$shiro17x.version Binary Distribution</a></li>
+                    <li><a href="#1.7.xSource">$shiro17x.version Source Code Distribution</a></li>
+                    <li><a href="#1.7.xGit">$shiro17x.version Git Source repository</a></li>
+                </ul>
+            </ul>
+            <ul>
                 <li><a href="#1.6.x">$shiro16x.version</a></li>
                 <ul>
                     <li><a href="#1.6.xBinary">$shiro16x.version Binary Distribution</a></li>
@@ -145,7 +153,7 @@
 <p>
 </p>
 
-#artifactTable($shiro17x)
+#artifactTable($shiro18x)
 
 <h4><a name="latestSource"></a>${latestRelease} Source Code Distribution</h4>
 
@@ -169,6 +177,41 @@
 
 <h2><a name="previous"></a>Previous Releases</h2>
 
+<!-- SHIRO 1.7.X VERSION -->
+<h3><a name="1.7.x"></a>${shiro17x.version}</h3>
+
+<h4><a name="1.7.xBinary"></a>${shiro17x.version} Binary Distribution</h4>
+
+<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($shiro17x)
+
+<h4><a name="1.7.xSource"></a>${shiro17x.version} Source Code Distribution</h4>
+
+<p>The source bundle requires JDK 1.8 and Maven 3.0.3+ to build:</p>
+
+<p><a class="external-link" href="https://www.apache.org/dyn/closer.lua/shiro/${shiro17x.version}/shiro-root-${shiro17x.version}-source-release.zip">zip</a>
+    (<a class="external-link"
+        href="https://www.apache.org/dist/shiro/${shiro16x.version}/shiro-root-${shiro17x.version}-source-release.zip.asc">pgp</a>, <a
+            class="external-link"
+            href="https://www.apache.org/dist/shiro/${shiro16x.version}/shiro-root-${shiro17x.version}-source-release.zip.md5">md5</a>, <a
+           class="external-link"
+           href="https://www.apache.org/dist/shiro/${shiro16x.version}/shiro-root-${shiro17x.version}-source-release.zip.sha1">sha1</a>)
+</p>
+
+<h4><a name="1.7.xGit"></a>${shiro17x.version} Git Source repository</h4>
+
+<p>The source can be cloned anonymously from Git with this command:</p>
+<pre><code class="bash">git clone https://github.com/apache/shiro.git
+git checkout shiro-root-${shiro17x.version} -b shiro-root-${shiro17x.version}
+</code></pre>
+
 <!-- SHIRO 1.6.X VERSION -->
 <h3><a name="1.6.x"></a>${shiro16x.version}</h3>
 
diff --git a/index.html b/index.html
index f401519..246af64 100644
--- a/index.html
+++ b/index.html
@@ -26,6 +26,10 @@
                 <div class="panel-body">
                     <div>
                         <a href="news.html">Release</a>
+                        <p><small>1.8.0 available! (2021-08-26)</small></p>
+                    </div>
+                    <div>
+                        <a href="news.html">Release</a>
                         <p><small>1.7.1 available with fix CVE-2020-17523 (2021-01-31)</small></p>
                     </div>
                     <div>
@@ -75,17 +79,6 @@
                     </div>
                 </div>
             </div>
-
-            <div class="panel panel-primary">
-                <div class=" panel-heading" style="text-align: center;">
-                    Communities Using Shiro:
-                </div>
-
-                <div class="panel-body communities">
-                    <img src="assets/images/logos.png" class="img-responsive center-block">
-                </div>
-            </div>
-
         </div>
     </div>
 
diff --git a/news.html b/news.html
index afad0c7..eb0a803 100644
--- a/news.html
+++ b/news.html
@@ -14,6 +14,31 @@
 <div class="blog-post-listing">
 
     <div class="logo-heading-block">
+        <a class="blogHeading" id="1.8.0-released" href="#1.8.0-released">Apache Shiro 1.8.0 Released</a>
+    </div>
+
+    <div class="news-content">
+        <p>The Shiro team is pleased to announce the release of Apache Shiro version 1.8.0. This is a feature release for 1.x.</p>
+
+        <p>This security release contains 1 fix since the 1.8.0 release and is available for Download now.</p>
+
+        You can learn more on <a href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310950&version=12350384" target="_blank">Jira</a>
+        </p>
+
+        <p>Release binaries (.jars) are also available through Maven Central and source bundles through Apache distribution mirrors.</p>
+
+        <p>For more information on <a href="documentation.html">Shiro, please read the documentation.</a></p>
+
+        <p>Enjoy!</p>
+
+        <p>The Apache Shiro Team</p>
+    </div>
+</div>
+
+
+<div class="blog-post-listing">
+
+    <div class="logo-heading-block">
         <a class="blogHeading" id="1.7.1-released" href="#1.7.1-released">Apache Shiro 1.7.1 Released</a>
     </div>
 
diff --git a/securitymanager.md.vtl b/securitymanager.md.vtl
index 3c48a04..f898df8 100644
--- a/securitymanager.md.vtl
+++ b/securitymanager.md.vtl
@@ -1,3 +1,5 @@
+#parse("templates/includes.vtl")
+
 <a name="SecurityManager-UnderstandingtheSecurityManagerinApacheShiro"></a>
 Understanding the SecurityManager in Apache Shiro
 =================================================
diff --git a/templates/versions.vtl b/templates/versions.vtl
index d9222ce..0df492c 100644
--- a/templates/versions.vtl
+++ b/templates/versions.vtl
@@ -1,5 +1,5 @@
-#set( $latestRelease = "1.7.1" )
-#set( $versionInfo = {"1.7.1": { "releaseDate": "2021-01-31" } } )
+#set( $latestRelease = "1.8.0" )
+#set( $versionInfo = {"1.8.0": { "releaseDate": "2021-08-26" } } )
 
 #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
@@ -155,7 +155,7 @@
     $shiroHasher
 ]} )
 
-#set( $shiro17x = {"version": $latestRelease, "artifacts": [
+#set( $shiro17x = {"version": "1.7.1", "artifacts": [
     $shiroAll,
     $shiroCore,
     $shiroWeb,
@@ -174,3 +174,21 @@
     $shiroHasher
 ]} )
 
+#set( $shiro18x = {"version": $latestRelease, "artifacts": [
+    $shiroAll,
+    $shiroCore,
+    $shiroWeb,
+    $shiroServletPlugin,
+    $shiroJaxrs,
+    $shiroAspectJ,
+    $shiroCas,
+    $shiroEhCache,
+    $shiroHazelcast,
+    $shiroFeatures,
+    $shiroGuice,
+    $shiroQuartz,
+    $shiroSpring,
+    $shiroSpringBoot,
+    $shiroSpringBootWeb,
+    $shiroHasher
+]} )