diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 6ba28afb..41b217d5 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -19,7 +19,6 @@ jobs:
           - ubuntu-latest
         # Keep this list as: all supported LTS JDKs, the latest GA JDK, and the latest EA JDK (optional).
         java:
-          - 11
           - 17
           - 21
           - 23
@@ -27,11 +26,6 @@ jobs:
           - wildfly-managed
           - glassfish-managed
           - tomee-managed
-        exclude:
-           # TomEE 10 requires Java 17.
-           - os: ubuntu-latest
-             java: 11
-             container: tomee-managed
     steps:
       - name: Checkout
         uses: actions/checkout@v4
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 9c523b0c..7109c94f 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -9,11 +9,11 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v4
         with:
           distribution: temurin
-          java-version: 11
+          java-version: 17
           cache: maven
       - name: Build with Maven
         run: ./mvnw --batch-mode --no-transfer-progress verify
diff --git a/README.adoc b/README.adoc
index 898c1cec..0b4c17d8 100644
--- a/README.adoc
+++ b/README.adoc
@@ -29,10 +29,31 @@ Warp has built-in support for the following frameworks:
 * Jakarta Servlet
 * Jakarta Faces
 
-NOTE: Warp version 2.0 (in development) is based on Jakarta EE 10 and requires JDK 11 or newer,
-      while version 1.1 is based on Java EE 8.
+=== Support Matrix
 
-// FIXME are these relevant?
+
+|===
+|Version |EE Version |JDK Version
+
+|2.1 (in development)
+|Jakarta EE 10
+|17
+
+|2.0
+|Jakarta EE 10
+|11
+
+|1.1
+|Java EE 8
+|11
+
+|1.0
+|Java EE 8
+|8
+
+|===
+
+// FIXME are these still relevant?
 // and it also has several framework extensions:
 //
 // * http://arquillian.org/blog/2012/07/24/arquillian-extension-spring-1-0-0-Alpha2/[Spring MVC] - led by https://github.com/jmnarloch/[Jakub Narloch]
diff --git a/build/ftest-base/pom.xml b/build/ftest-base/pom.xml
index 4c2f9299..6fa24892 100644
--- a/build/ftest-base/pom.xml
+++ b/build/ftest-base/pom.xml
@@ -208,32 +208,6 @@
           <scope>test</scope>
         </dependency>
       </dependencies>
-
-      <!--This profile requires Java 17 to run, as this is required by TomEE -->
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-enforcer-plugin</artifactId>
-            <version>3.5.0</version>
-            <executions>
-              <execution>
-                <id>enforce-java</id>
-                <goals>
-                  <goal>enforce</goal>
-                </goals>
-                <configuration>
-                  <rules>
-                    <requireJavaVersion>
-                      <version>17</version>
-                    </requireJavaVersion>
-                  </rules>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
     </profile>
     <profile>
       <!-- Don't run this profile on windows: the test performance will be incredibly poor (90 seconds per test).
diff --git a/pom.xml b/pom.xml
index dda9f1e7..bef40798 100644
--- a/pom.xml
+++ b/pom.xml
@@ -63,6 +63,11 @@
   </ciManagement>
 
   <properties>
+    <!-- JBoss Parent -->
+    <maven.compiler.release>17</maven.compiler.release>
+    <maven.compiler.target>${maven.compiler.release}</maven.compiler.target>
+    <maven.compiler.source>${maven.compiler.release}</maven.compiler.source>
+
     <!-- Arquillian -->
     <version.arquillian_core>1.9.4.Final</version.arquillian_core>
     <version.org.jboss.arquillian.jakarta>10.0.0.Final</version.org.jboss.arquillian.jakarta>