2.11.0.M7 release
diff --git a/src/main/jbake/assets/apidocs/index.html b/src/main/jbake/assets/apidocs/index.html
index a4c629a..010cc5e 100755
--- a/src/main/jbake/assets/apidocs/index.html
+++ b/src/main/jbake/assets/apidocs/index.html
@@ -2,13 +2,13 @@
 <html lang="en-US">

     <head>

         <meta charset="UTF-8">

-        <meta http-equiv="refresh" content="1;url=http://jspwiki.apache.org/apidocs/2.11.0.M6/">

+        <meta http-equiv="refresh" content="1;url=http://jspwiki.apache.org/apidocs/2.11.0.M7/">

         <script type="text/javascript">

-            window.location.href = "http://jspwiki.apache.org/apidocs/2.11.0.M6/"

+            window.location.href = "http://jspwiki.apache.org/apidocs/2.11.0.M7/"

         </script>

         <title>redirecting to latest javadocs</title>

     </head>

     <body>

-        If you are not redirected automatically, follow the link to <a href='http://jspwiki.apache.org/apidocs/2.11.0.M6/'>latest javadocs</a>.

+        If you are not redirected automatically, follow the link to <a href='http://jspwiki.apache.org/apidocs/2.11.0.M7/'>latest javadocs</a>.

     </body>

 </html>

diff --git a/src/main/jbake/assets/japicmp/index.html b/src/main/jbake/assets/japicmp/index.html
index 217964d..8ec42fb 100644
--- a/src/main/jbake/assets/japicmp/index.html
+++ b/src/main/jbake/assets/japicmp/index.html
@@ -2,13 +2,13 @@
 <html lang="en-US">
     <head>
         <meta charset="UTF-8">
-        <meta http-equiv="refresh" content="1;url=http://jspwiki.apache.org/japicmp/2.11.0.M6/">
+        <meta http-equiv="refresh" content="1;url=http://jspwiki.apache.org/japicmp/2.11.0.M7/">
         <script type="text/javascript">
-            window.location.href = "http://jspwiki.apache.org/japicmp/2.11.0.M6/"
+            window.location.href = "http://jspwiki.apache.org/japicmp/2.11.0.M7/"
         </script>
         <title>redirecting to latest compatibility reports</title>
     </head>
     <body>
-        If you are not redirected automatically, follow the link to <a href='http://jspwiki.apache.org/japicmp/2.11.0.M6/'>latest compatibility reports</a>.
+        If you are not redirected automatically, follow the link to <a href='http://jspwiki.apache.org/japicmp/2.11.0.M7/'>latest compatibility reports</a>.
     </body>
 </html>
diff --git a/src/main/jbake/content/general/downloads.md b/src/main/jbake/content/general/downloads.md
index d9d01c0..4e2d53c 100755
--- a/src/main/jbake/content/general/downloads.md
+++ b/src/main/jbake/content/general/downloads.md
@@ -16,9 +16,12 @@
 
 <br/> **Release Index**
 
+* **28-May-2020**: The current release version is <a class="external" href="https://jspwiki-wiki.apache.org/Wiki.jsp?page=NewIn2.11#section-NewIn2.11-SectionNewIn2.11NewInJSPWiki2.11.0.M7ReleasedOn28052020">2.11.0.M7</a>. This release fixes the following issues:
+https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310732&version=12346642 <br/>
+<strong><a class="external" href="https://www.apache.org/dyn/closer.lua/jspwiki/2.11.0.M7/source/jspwiki-builder-2.11.0.M7-source-release.zip">source</a></strong> | <strong><a class="external" href="https://downloads.apache.org/jspwiki/2.11.0.M7/source/jspwiki-builder-2.11.0.M7-source-release.zip.sha512">checksum</a></strong> | <strong><a class="external" href="https://downloads.apache.org/jspwiki/2.11.0.M7/source/jspwiki-builder-2.11.0.M7-source-release.zip.asc">signature</a></strong>
+
 * **17-Dec-2019**: The current release version is <a class="external" href="https://jspwiki-wiki.apache.org/Wiki.jsp?page=NewIn2.11#section-NewIn2.11-SectionNewIn2.11NewInJSPWiki2.11.0.M6ReleasedOn17122019">2.11.0.M6</a>. This release fixes the following issues:
-https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310732&version=12346489 <br/>
-<strong><a class="external" href="https://www.apache.org/dyn/closer.lua/jspwiki/2.11.0.M6/source/jspwiki-builder-2.11.0.M6-source-release.zip">source</a></strong> | <strong><a class="external" href="https://downloads.apache.org/jspwiki/2.11.0.M6/source/jspwiki-builder-2.11.0.M6-source-release.zip.sha512">checksum</a></strong> | <strong><a class="external" href="https://downloads.apache.org/jspwiki/2.11.0.M6/source/jspwiki-builder-2.11.0.M6-source-release.zip.asc">signature</a></strong>
+https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310732&version=12346489 
 
 * **18-Sep-2019**: released version <a class="external" href="https://jspwiki-wiki.apache.org/Wiki.jsp?page=NewIn2.11#section-NewIn2.11-SectionNewIn2.11NewInJSPWiki2.11.0.M5ReleasedOn18092019">2.11.0.M5</a>. This release fixes the following issues:
 https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310732&version=12345540 
diff --git a/src/main/jbake/content/general/news.md b/src/main/jbake/content/general/news.md
index f45bab3..a3fdaa4 100755
--- a/src/main/jbake/content/general/news.md
+++ b/src/main/jbake/content/general/news.md
@@ -6,6 +6,8 @@
 
 ## Project News
 
+  * **28-May-2020**: Official [Apache JSPWiki 2.11.0.M7][] release is out!
+
   * **17-Dec-2019**: Official [Apache JSPWiki 2.11.0.M6][] release is out!
 
   * **19-Sep-2019:** Apache JSPWiki [CVE-2019-10087][], [CVE-2019-10089][], [CVE-2019-10090][], [CVE-2019-12404][] and [CVE-2019-12407][] vulnerability disclosures
@@ -85,6 +87,7 @@
 [Apache JSPWiki 2.11.0.M4 release]: downloads.html
 [Apache JSPWiki 2.11.0.M5 release]: downloads.html
 [Apache JSPWiki 2.11.0.M6 release]: downloads.html
+[Apache JSPWiki 2.11.0.M7 release]: downloads.html
 [CVE-2018-20242]: https://jspwiki-wiki.apache.org/Wiki.jsp?page=CVE-2018-20242
 [CVE-2019-0224]:  https://jspwiki-wiki.apache.org/Wiki.jsp?page=CVE-2019-0224
 [CVE-2019-0225]:  https://jspwiki-wiki.apache.org/Wiki.jsp?page=CVE-2019-0225
diff --git a/src/main/jbake/content/index.md b/src/main/jbake/content/index.md
index 90f466c..8b3aeb7 100755
--- a/src/main/jbake/content/index.md
+++ b/src/main/jbake/content/index.md
@@ -27,6 +27,8 @@
 
 ## Project status
 
+  * **28-May-2020**: Official [Apache JSPWiki 2.11.0.M7 release][] release is out!
+
   * **17-Dec-2019**: Official [Apache JSPWiki 2.11.0.M6 release][] is out!
 
   * **19-Sep-2019:** Apache JSPWiki [CVE-2019-10087][], [CVE-2019-10089][], [CVE-2019-10090][], [CVE-2019-12404][] and [CVE-2019-12407][] vulnerability disclosures
@@ -39,8 +41,6 @@
 
   * **25-Mar-2019:** Apache JSPWiki [CVE-2019-0224][] and [CVE-2019-0225][] vulnerability disclosures
 
-  * **25-Mar-2019:** Official [Apache JSPWiki 2.11.0.M3 release][] is out!
-
 [Apache JSPWiki]: https://jspwiki.apache.org
 [WikiWiki]: https://jspwiki-wiki.apache.org/Wiki.jsp?page=WikiWiki
 [JEE]: https://jspwiki-wiki.apache.org/Wiki.jsp?page=JEE
@@ -53,10 +53,10 @@
 [JSPWiki today]: https://jspwiki-wiki.apache.org/Wiki.jsp?page=JSPWikiSites
 [WikiMatrix]: http://www.wikimatrix.org/show/JSPWiki
 [Getting Involved]: https://jspwiki-wiki.apache.org/Wiki.jsp?page=Getting%20Involved
+[Apache JSPWiki 2.11.0.M7 release]: https://jspwiki-wiki.apache.org/Wiki.jsp?page=NewIn2.11#section-NewIn2.11-SectionNewIn2.11NewInJSPWiki2.11.0.M7ReleasedOn28052020
 [Apache JSPWiki 2.11.0.M6 release]: https://jspwiki-wiki.apache.org/Wiki.jsp?page=NewIn2.11#section-NewIn2.11-SectionNewIn2.11NewInJSPWiki2.11.0.M6ReleasedOn17122019
 [Apache JSPWiki 2.11.0.M5 release]: https://jspwiki-wiki.apache.org/Wiki.jsp?page=NewIn2.11#section-NewIn2.11-SectionNewIn2.11NewInJSPWiki2.11.0.M5ReleasedOn18092019
 [Apache JSPWiki 2.11.0.M4 release]: https://jspwiki-wiki.apache.org/Wiki.jsp?page=NewIn2.11#section-NewIn2.11-SectionNewIn2.11NewInJSPWiki2.11.0.M4ReleasedOn18052019
-[Apache JSPWiki 2.11.0.M3 release]: https://jspwiki-wiki.apache.org/Wiki.jsp?page=NewIn2.11#section-NewIn2.11-SectionNewIn2.11NewInJSPWiki2.11.0.M3ReleasedOn25032019
 [CVE-2019-0224]:  https://jspwiki-wiki.apache.org/Wiki.jsp?page=CVE-2019-0224
 [CVE-2019-0225]:  https://jspwiki-wiki.apache.org/Wiki.jsp?page=CVE-2019-0225
 [CVE-2019-10076]:  https://jspwiki-wiki.apache.org/Wiki.jsp?page=CVE-2019-10076