Merge branch 'new-home-page' of github.com:Dexmaster/tomee-site-generator into new-home-page
diff --git a/src/main/jbake/assets/css/cardio.css b/src/main/jbake/assets/css/cardio.css
index 8aa3966..10de1b4 100755
--- a/src/main/jbake/assets/css/cardio.css
+++ b/src/main/jbake/assets/css/cardio.css
@@ -1759,4 +1759,4 @@
 
 .navbar-brand img {
   margin: -5px 0;
-}
+}
\ No newline at end of file
diff --git a/src/main/jbake/content/9.0.0-M7/release-notes.adoc b/src/main/jbake/content/9.0.0-M7/release-notes.adoc
index 2495c04..5c0dca4 100644
--- a/src/main/jbake/content/9.0.0-M7/release-notes.adoc
+++ b/src/main/jbake/content/9.0.0-M7/release-notes.adoc
@@ -7,15 +7,14 @@
 
 [.compact]
  - link:https://issues.apache.org/jira/browse/TOMEE-2990[TOMEE-2990] BatchEE 0.6
- - link:https://issues.apache.org/jira/browse/TOMEE-2996[TOMEE-2996] CXF 3.3.10 / 3.4.3
- - link:https://issues.apache.org/jira/browse/TOMEE-2987[TOMEE-2987] CXF 3.4.x (Java 16 support)
- - link:https://issues.apache.org/jira/browse/TOMEE-2969[TOMEE-2969] MyFaces 2.3.8
+ - link:https://issues.apache.org/jira/browse/TOMEE-2987[TOMEE-2987] CXF 3.4.3
+ - link:https://issues.apache.org/jira/browse/TOMEE-3747[TOMEE-3747] EclipseLink 3.0.0
+ - link:https://issues.apache.org/jira/browse/TOMEE-3749[TOMEE-3749] Hibernate Validator 5.1.3.Final
+ - link:https://issues.apache.org/jira/browse/TOMEE-3748[TOMEE-3748] Mojarra 3.0.0
  - link:https://issues.apache.org/jira/browse/TOMEE-3732[TOMEE-3732] MyFaces 2.3.9
- - link:https://issues.apache.org/jira/browse/TOMEE-2809[TOMEE-2809] OWB 2.0.22
  - link:https://issues.apache.org/jira/browse/TOMEE-2997[TOMEE-2997] OpenSAML V3.4.6
- - link:https://issues.apache.org/jira/browse/TOMEE-2971[TOMEE-2971] Tomcat 9.0.43
- - link:https://issues.apache.org/jira/browse/TOMEE-2991[TOMEE-2991] Tomcat 9.0.44
- - link:https://issues.apache.org/jira/browse/TOMEE-2998[TOMEE-2998] Tomcat 9.0.45
+ - link:https://issues.apache.org/jira/browse/TOMEE-2809[TOMEE-2809] OpenWebBeans 2.0.22
+ - link:https://issues.apache.org/jira/browse/TOMEE-3746[TOMEE-3746] Tomcat 10.0.4
  - link:https://issues.apache.org/jira/browse/TOMEE-2939[TOMEE-2939] bcprov-jdk15on 1.67
  - link:https://issues.apache.org/jira/browse/TOMEE-2988[TOMEE-2988] xbean 4.18+ (Java 16 support)
 
@@ -53,11 +52,8 @@
 
 [.compact]
  - link:https://issues.apache.org/jira/browse/TOMEE-3210[TOMEE-3210] securityapi.idstore.idstorepermission testIdentityStore_customHandlerWithoutIDStorePermission
- - link:https://issues.apache.org/jira/browse/TOMEE-3177[TOMEE-3177] jaxrs.spec.filter.interceptor fileReaderContainerInterceptorTest
  - link:https://issues.apache.org/jira/browse/TOMEE-3211[TOMEE-3211] securityapi.securitycontext.callerdata testSecurityContextHasAccessToWebResource
- - link:https://issues.apache.org/jira/browse/TOMEE-3178[TOMEE-3178] jaxrs.spec.filter.interceptor fileReaderNoInterceptorTest
  - link:https://issues.apache.org/jira/browse/TOMEE-3212[TOMEE-3212] securityapi.securitycontext.getprincipalsbytype testSecurityContextGetPrincipalsByType
- - link:https://issues.apache.org/jira/browse/TOMEE-3179[TOMEE-3179] jaxrs.spec.filter.lastvalue readerContextOnContainerTest
  - link:https://issues.apache.org/jira/browse/TOMEE-3213[TOMEE-3213] servlet.api.jakarta_servlet.asynccontext forwardTest1
  - link:https://issues.apache.org/jira/browse/TOMEE-3214[TOMEE-3214] servlet.api.jakarta_servlet.asynccontext originalRequestTest4
  - link:https://issues.apache.org/jira/browse/TOMEE-3215[TOMEE-3215] servlet.api.jakarta_servlet.srevent getServletRequestTest
@@ -66,7 +62,6 @@
  - link:https://issues.apache.org/jira/browse/TOMEE-3207[TOMEE-3207] jsp.spec.configuration.general moreSpecificMappingTest
  - link:https://issues.apache.org/jira/browse/TOMEE-3208[TOMEE-3208] jsp.spec.configuration.general mostSpecificMappingTest
  - link:https://issues.apache.org/jira/browse/TOMEE-3209[TOMEE-3209] jstl.spec.core.urlresource.importtag positiveImportEncodingNotSpecifiedTest
- - link:https://issues.apache.org/jira/browse/TOMEE-3180[TOMEE-3180] jaxrs.spec.provider.exceptionmapper mappedExceptionTest
  - link:https://issues.apache.org/jira/browse/TOMEE-3181[TOMEE-3181] jaxrs.spec.provider.jaxbcontext readWriteProviderTest
  - link:https://issues.apache.org/jira/browse/TOMEE-3182[TOMEE-3182] jaxrs.spec.provider.standard fileProviderTest
  - link:https://issues.apache.org/jira/browse/TOMEE-3183[TOMEE-3183] jaxrs.spec.provider.standardhaspriority readWriteBooleanProviderTest
diff --git a/src/main/jbake/content/download.adoc b/src/main/jbake/content/download.adoc
index 6d78503..b144253 100755
--- a/src/main/jbake/content/download.adoc
+++ b/src/main/jbake/content/download.adoc
@@ -8,11 +8,13 @@
 
 You **must** link:https://www.apache.org/info/verification.html[verify] the integrity of the downloaded files. We provide OpenPGP signatures  (*.asc files) for every release file. This signature should be matched against link:https://downloads.apache.org/tomee/KEYS[KEYS] file which contains the OpenPGP keys of TomEE's Release Managers. We also provide SHA-512 checksums for every release file. After you download the file, you should calculate a checksum for your download, and make sure it is the same as ours.
 
-== Apache TomEE TCK results
+== Apache TomEE 9.0
 
-link:9.0.0-M7/plume/webprofile-9.1.html[Apache TomEE TCK Results]
-
-== Download Links
+- Jakarta EE 9.1
+- MicroProfile 2.0
+- Java 8 or higher
+- link:9.0.0-M7/release-notes.html[Release Notes]
+- link:9.0.0-M7/plume/webprofile-9.1.html[Jakarta EE 9.1 Web Profile TCK Results for Java 11]
 
 [cols="2,4*^1",options="header"]
 |===
@@ -30,6 +32,12 @@
 IMPORTANT: Note: TomEE 9.0.0-M7 is a milestone release, which targets the `jakarta` namespace. Applications using `javax` will not work on this release of TomEE 9. You may encounter issues - feedback on this release is encouraged
 and appreciated.
 
+== Apache TomEE 8.0
+
+- Jakarta EE 8 / Java EE 8
+- MicroProfile 2.0
+- Java 8 or higher
+
 [cols="2,4*^1",options="header"]
 |===
 |Name|Version|Date|Size|Signatures & Hashes
@@ -50,7 +58,11 @@
 |https://www.apache.org/dyn/closer.cgi/tomee/tomee-8.0.6/tomee-webapp-8.0.6.war[icon:download[] TomEE Webapp WAR] |8.0.6|25 Jan. 2021|34 MB |https://downloads.apache.org/tomee/tomee-8.0.6/tomee-webapp-8.0.6.war.asc[icon:download[] PGP] https://downloads.apache.org/tomee/tomee-8.0.6/tomee-webapp-8.0.6.war.sha512[icon:download[] SHA512]
 |===
 
-IMPORTANT: Note: Only the TomEE 1.x WebProfile and JAX-RS distributions are certified.
+== Apache TomEE 7.1
+
+- Java EE 7
+- MicroProfile 2.0
+- Java 7 or Java 8
 
 [cols="2,4*^1",options="header"]
 |===
@@ -70,7 +82,16 @@
 |https://www.apache.org/dyn/closer.cgi/tomee/tomee-7.1.4/tomee-plus-webapp-7.1.4.war[icon:download[] TomEE Plus Webapp WAR] |7.1.4|25 Sep. 2020|45 MB |https://downloads.apache.org/tomee/tomee-7.1.4/tomee-plus-webapp-7.1.4.war.asc[icon:download[] PGP] https://downloads.apache.org/tomee/tomee-7.1.4/tomee-plus-webapp-7.1.4.war.sha512[icon:download[] SHA512]
 |https://www.apache.org/dyn/closer.cgi/tomee/tomee-7.1.4/tomee-project-7.1.4-source-release.zip[icon:download[] TomEE Project Source Release ZIP] |7.1.4|25 Sep. 2020|13 MB |https://downloads.apache.org/tomee/tomee-7.1.4/tomee-project-7.1.4-source-release.zip.asc[icon:download[] PGP] https://downloads.apache.org/tomee/tomee-7.1.4/tomee-project-7.1.4-source-release.zip.sha512[icon:download[] SHA512]
 |https://www.apache.org/dyn/closer.cgi/tomee/tomee-7.1.4/tomee-webapp-7.1.4.war[icon:download[] TomEE Webapp WAR] |7.1.4|25 Sep. 2020|29 MB |https://downloads.apache.org/tomee/tomee-7.1.4/tomee-webapp-7.1.4.war.asc[icon:download[] PGP] https://downloads.apache.org/tomee/tomee-7.1.4/tomee-webapp-7.1.4.war.sha512[icon:download[] SHA512]
-|||||
+|===
+
+== Apache TomEE 7.0
+
+- Java EE 7
+- Java 7 or Java 8
+
+[cols="2,4*^1",options="header"]
+|===
+|Name|Version|Date|Size|Signatures & Hashes
 |https://www.apache.org/dyn/closer.cgi/tomee/tomee-7.0.9/apache-tomee-7.0.9-plume.tar.gz[icon:download[] TomEE Plume TAR.GZ] |7.0.9|25 Sep. 2020|60 MB |https://downloads.apache.org/tomee/tomee-7.0.9/apache-tomee-7.0.9-plume.tar.gz.asc[icon:download[] PGP] https://downloads.apache.org/tomee/tomee-7.0.9/apache-tomee-7.0.9-plume.tar.gz.sha512[icon:download[] SHA512]
 |https://www.apache.org/dyn/closer.cgi/tomee/tomee-7.0.9/apache-tomee-7.0.9-plume.zip[icon:download[] TomEE Plume ZIP] |7.0.9|25 Sep. 2020|60 MB |https://downloads.apache.org/tomee/tomee-7.0.9/apache-tomee-7.0.9-plume.zip.asc[icon:download[] PGP] https://downloads.apache.org/tomee/tomee-7.0.9/apache-tomee-7.0.9-plume.zip.sha512[icon:download[] SHA512]
 |https://www.apache.org/dyn/closer.cgi/tomee/tomee-7.0.9/apache-tomee-7.0.9-plus.tar.gz[icon:download[] TomEE Plus TAR.GZ] |7.0.9|25 Sep. 2020|53 MB |https://downloads.apache.org/tomee/tomee-7.0.9/apache-tomee-7.0.9-plus.tar.gz.asc[icon:download[] PGP] https://downloads.apache.org/tomee/tomee-7.0.9/apache-tomee-7.0.9-plus.tar.gz.sha512[icon:download[] SHA512]
@@ -83,7 +104,17 @@
 |https://www.apache.org/dyn/closer.cgi/tomee/tomee-7.0.9/tomee-plus-webapp-7.0.9.war[icon:download[] TomEE Plus Webapp WAR] |7.0.9|25 Sep. 2020|44 MB |https://downloads.apache.org/tomee/tomee-7.0.9/tomee-plus-webapp-7.0.9.war.asc[icon:download[] PGP] https://downloads.apache.org/tomee/tomee-7.0.9/tomee-plus-webapp-7.0.9.war.sha512[icon:download[] SHA512]
 |https://www.apache.org/dyn/closer.cgi/tomee/tomee-7.0.9/tomee-project-7.0.9-source-release.zip[icon:download[] TomEE Project Source Release ZIP] |7.0.9|25 Sep. 2020|13 MB |https://downloads.apache.org/tomee/tomee-7.0.9/tomee-project-7.0.9-source-release.zip.asc[icon:download[] PGP] https://downloads.apache.org/tomee/tomee-7.0.9/tomee-project-7.0.9-source-release.zip.sha512[icon:download[] SHA512]
 |https://www.apache.org/dyn/closer.cgi/tomee/tomee-7.0.9/tomee-webapp-7.0.9.war[icon:download[] TomEE Webapp WAR] |7.0.9|25 Sep. 2020|27 MB |https://downloads.apache.org/tomee/tomee-7.0.9/tomee-webapp-7.0.9.war.asc[icon:download[] PGP] https://downloads.apache.org/tomee/tomee-7.0.9/tomee-webapp-7.0.9.war.sha512[icon:download[] SHA512]
-|||||
+|===
+
+== Apache TomEE 1.7
+
+- Java EE 6
+- Java 6, Java 7 or Java 8
+
+
+[cols="2,4*^1",options="header"]
+|===
+|Name|Version|Date|Size|Signatures & Hashes
 |https://www.apache.org/dyn/closer.cgi/tomee/tomee-1.7.5/apache-tomee-1.7.5-jaxrs.zip[icon:download[] TomEE Jaxrs ZIP] |1.7.5|27 Sep. 2017|33 MB |https://downloads.apache.org/tomee/tomee-1.7.5/apache-tomee-1.7.5-jaxrs.zip.asc[icon:download[] PGP] https://downloads.apache.org/tomee/tomee-1.7.5/apache-tomee-1.7.5-jaxrs.zip.sha1[icon:download[] SHA1]
 |https://www.apache.org/dyn/closer.cgi/tomee/tomee-1.7.5/apache-tomee-1.7.5-jaxrs.tar.gz[icon:download[] TomEE Jaxrs TAR.GZ] |1.7.5|27 Sep. 2017|32 MB |https://downloads.apache.org/tomee/tomee-1.7.5/apache-tomee-1.7.5-jaxrs.tar.gz.asc[icon:download[] PGP] https://downloads.apache.org/tomee/tomee-1.7.5/apache-tomee-1.7.5-jaxrs.tar.gz.sha1[icon:download[] SHA1]
 |https://www.apache.org/dyn/closer.cgi/tomee/tomee-1.7.5/apache-tomee-1.7.5-plume.tar.gz[icon:download[] TomEE Plume TAR.GZ] |1.7.5|27 Sep. 2017|49 MB |https://downloads.apache.org/tomee/tomee-1.7.5/apache-tomee-1.7.5-plume.tar.gz.asc[icon:download[] PGP] https://downloads.apache.org/tomee/tomee-1.7.5/apache-tomee-1.7.5-plume.tar.gz.sha1[icon:download[] SHA1]