From 850af55edc1eaed7b9bec0c7a6b247296a44bc8e Mon Sep 17 00:00:00 2001
From: Alexander Schwartz <aschwart@redhat.com>
Date: Sat, 14 May 2022 18:13:30 +0200
Subject: [PATCH] Ensure that only JDK 8 APIs are used where JDK 8 is still
 required.

Closes #10842
---
 adapters/oidc/adapter-core/pom.xml                 | 3 ---
 adapters/oidc/jetty/jetty-core/pom.xml             | 3 ---
 adapters/oidc/servlet-filter/pom.xml               | 3 ---
 adapters/oidc/tomcat/tomcat-core/pom.xml           | 4 ----
 adapters/oidc/tomcat/tomcat/pom.xml                | 4 ----
 adapters/oidc/undertow/pom.xml                     | 3 ---
 adapters/saml/core-public/pom.xml                  | 3 ---
 adapters/saml/core/pom.xml                         | 3 ---
 adapters/saml/jetty/jetty-core/pom.xml             | 3 ---
 adapters/saml/servlet-filter/pom.xml               | 5 -----
 adapters/saml/tomcat/tomcat-core/pom.xml           | 4 ----
 adapters/saml/tomcat/tomcat/pom.xml                | 4 ----
 adapters/spi/adapter-spi/pom.xml                   | 3 ---
 adapters/spi/jboss-adapter-core/pom.xml            | 5 -----
 adapters/spi/jetty-adapter-spi/pom.xml             | 3 ---
 adapters/spi/servlet-adapter-spi/pom.xml           | 3 ---
 adapters/spi/tomcat-adapter-spi/pom.xml            | 4 ----
 adapters/spi/undertow-adapter-spi/pom.xml          | 3 ---
 authz/client/pom.xml                               | 3 ---
 common/pom.xml                                     | 3 ---
 core/pom.xml                                       | 3 ---
 docs/building.md                                   | 2 +-
 pom.xml                                            | 5 +++++
 saml-core-api/pom.xml                              | 3 ---
 saml-core/pom.xml                                  | 3 ---
 testsuite/integration-arquillian/test-apps/pom.xml | 5 -----
 26 files changed, 6 insertions(+), 84 deletions(-)

diff --git a/adapters/oidc/adapter-core/pom.xml b/adapters/oidc/adapter-core/pom.xml
index 41ff595776d..0dd6a09a1ca 100755
--- a/adapters/oidc/adapter-core/pom.xml
+++ b/adapters/oidc/adapter-core/pom.xml
@@ -31,9 +31,6 @@
     <description/>
 
     <properties>
-        <maven.compiler.target>1.8</maven.compiler.target>
-        <maven.compiler.source>1.8</maven.compiler.source>
-
         <keycloak.osgi.export>
             org.keycloak.adapters.*
         </keycloak.osgi.export>
diff --git a/adapters/oidc/jetty/jetty-core/pom.xml b/adapters/oidc/jetty/jetty-core/pom.xml
index 669fd95e100..aba8711bc7a 100755
--- a/adapters/oidc/jetty/jetty-core/pom.xml
+++ b/adapters/oidc/jetty/jetty-core/pom.xml
@@ -29,9 +29,6 @@
     <artifactId>keycloak-jetty-core</artifactId>
     <name>Keycloak Jetty Core Integration</name>
     <properties>
-        <maven.compiler.target>1.8</maven.compiler.target>
-        <maven.compiler.source>1.8</maven.compiler.source>
-
         <keycloak.osgi.export>
             org.keycloak.adapters.jetty.core.*
         </keycloak.osgi.export>
diff --git a/adapters/oidc/servlet-filter/pom.xml b/adapters/oidc/servlet-filter/pom.xml
index 78e96b4f93f..2b3264115e1 100755
--- a/adapters/oidc/servlet-filter/pom.xml
+++ b/adapters/oidc/servlet-filter/pom.xml
@@ -31,9 +31,6 @@
     <description/>
 
     <properties>
-        <maven.compiler.target>1.8</maven.compiler.target>
-        <maven.compiler.source>1.8</maven.compiler.source>
-
         <keycloak.osgi.export>
             org.keycloak.adapters.servlet.*
         </keycloak.osgi.export>
diff --git a/adapters/oidc/tomcat/tomcat-core/pom.xml b/adapters/oidc/tomcat/tomcat-core/pom.xml
index bdb9944fbf8..8ae1de82b28 100755
--- a/adapters/oidc/tomcat/tomcat-core/pom.xml
+++ b/adapters/oidc/tomcat/tomcat-core/pom.xml
@@ -28,10 +28,6 @@
 
     <artifactId>keycloak-tomcat-core-adapter</artifactId>
     <name>Keycloak Tomcat Core Integration</name>
-    <properties>
-        <maven.compiler.target>1.8</maven.compiler.target>
-        <maven.compiler.source>1.8</maven.compiler.source>
-    </properties>
     <description />
 
     <dependencies>
diff --git a/adapters/oidc/tomcat/tomcat/pom.xml b/adapters/oidc/tomcat/tomcat/pom.xml
index 2d4c791b3c9..720875b93ca 100755
--- a/adapters/oidc/tomcat/tomcat/pom.xml
+++ b/adapters/oidc/tomcat/tomcat/pom.xml
@@ -28,10 +28,6 @@
 
     <artifactId>keycloak-tomcat-adapter</artifactId>
     <name>Keycloak Tomcat Integration</name>
-    <properties>
-        <maven.compiler.target>1.8</maven.compiler.target>
-        <maven.compiler.source>1.8</maven.compiler.source>
-    </properties>
     <description />
 
     <dependencies>
diff --git a/adapters/oidc/undertow/pom.xml b/adapters/oidc/undertow/pom.xml
index 4372d294490..6c2c211e454 100755
--- a/adapters/oidc/undertow/pom.xml
+++ b/adapters/oidc/undertow/pom.xml
@@ -31,9 +31,6 @@
     <description/>
 
     <properties>
-        <maven.compiler.target>1.8</maven.compiler.target>
-        <maven.compiler.source>1.8</maven.compiler.source>
-
         <keycloak.osgi.export>
             org.keycloak.adapters.undertow.*
         </keycloak.osgi.export>
diff --git a/adapters/saml/core-public/pom.xml b/adapters/saml/core-public/pom.xml
index 261ca2b7242..4c79f3f5eea 100755
--- a/adapters/saml/core-public/pom.xml
+++ b/adapters/saml/core-public/pom.xml
@@ -32,9 +32,6 @@
 
 
     <properties>
-        <maven.compiler.target>1.8</maven.compiler.target>
-        <maven.compiler.source>1.8</maven.compiler.source>
-
         <timestamp>${maven.build.timestamp}</timestamp>
         <maven.build.timestamp.format>yyyy-MM-dd HH:mm</maven.build.timestamp.format>
     </properties>
diff --git a/adapters/saml/core/pom.xml b/adapters/saml/core/pom.xml
index 80ec2217354..516a546bdce 100755
--- a/adapters/saml/core/pom.xml
+++ b/adapters/saml/core/pom.xml
@@ -31,9 +31,6 @@
     <description/>
 
     <properties>
-        <maven.compiler.target>1.8</maven.compiler.target>
-        <maven.compiler.source>1.8</maven.compiler.source>
-
         <timestamp>${maven.build.timestamp}</timestamp>
         <maven.build.timestamp.format>yyyy-MM-dd HH:mm</maven.build.timestamp.format>
     </properties>
diff --git a/adapters/saml/jetty/jetty-core/pom.xml b/adapters/saml/jetty/jetty-core/pom.xml
index 4aa6399287d..a6fdeae1618 100755
--- a/adapters/saml/jetty/jetty-core/pom.xml
+++ b/adapters/saml/jetty/jetty-core/pom.xml
@@ -29,9 +29,6 @@
     <artifactId>keycloak-saml-jetty-adapter-core</artifactId>
     <name>Keycloak Jetty Core SAML Integration</name>
     <properties>
-        <maven.compiler.target>1.8</maven.compiler.target>
-        <maven.compiler.source>1.8</maven.compiler.source>
-
         <jetty9.version>8.1.17.v20150415</jetty9.version>
         <keycloak.osgi.export>
             org.keycloak.adapters.jetty.core.*
diff --git a/adapters/saml/servlet-filter/pom.xml b/adapters/saml/servlet-filter/pom.xml
index 6e4b4364cfc..76b255e7cbf 100755
--- a/adapters/saml/servlet-filter/pom.xml
+++ b/adapters/saml/servlet-filter/pom.xml
@@ -30,11 +30,6 @@
     <name>Keycloak SAML Servlet Filter</name>
     <description />
 
-    <properties>
-        <maven.compiler.target>1.8</maven.compiler.target>
-        <maven.compiler.source>1.8</maven.compiler.source>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>org.jboss.logging</groupId>
diff --git a/adapters/saml/tomcat/tomcat-core/pom.xml b/adapters/saml/tomcat/tomcat-core/pom.xml
index f4db81db600..6680ec758f3 100755
--- a/adapters/saml/tomcat/tomcat-core/pom.xml
+++ b/adapters/saml/tomcat/tomcat-core/pom.xml
@@ -28,10 +28,6 @@
 
     <artifactId>keycloak-saml-tomcat-adapter-core</artifactId>
     <name>Keycloak Tomcat Core SAML Integration</name>
-    <properties>
-        <maven.compiler.target>1.8</maven.compiler.target>
-        <maven.compiler.source>1.8</maven.compiler.source>
-    </properties>
     <description />
 
     <dependencies>
diff --git a/adapters/saml/tomcat/tomcat/pom.xml b/adapters/saml/tomcat/tomcat/pom.xml
index 43714f5d9e4..4198ed01e58 100755
--- a/adapters/saml/tomcat/tomcat/pom.xml
+++ b/adapters/saml/tomcat/tomcat/pom.xml
@@ -28,10 +28,6 @@
 
     <artifactId>keycloak-saml-tomcat-adapter</artifactId>
     <name>Keycloak Tomcat SAML Integration</name>
-    <properties>
-        <maven.compiler.target>1.8</maven.compiler.target>
-        <maven.compiler.source>1.8</maven.compiler.source>
-    </properties>
     <description />
 
     <dependencies>
diff --git a/adapters/spi/adapter-spi/pom.xml b/adapters/spi/adapter-spi/pom.xml
index 9d1acc8777e..4378fd97e8c 100755
--- a/adapters/spi/adapter-spi/pom.xml
+++ b/adapters/spi/adapter-spi/pom.xml
@@ -31,9 +31,6 @@
     <description/>
 
     <properties>
-        <maven.compiler.target>1.8</maven.compiler.target>
-        <maven.compiler.source>1.8</maven.compiler.source>
-
         <keycloak.osgi.export>
             org.keycloak.adapters.spi.*
         </keycloak.osgi.export>
diff --git a/adapters/spi/jboss-adapter-core/pom.xml b/adapters/spi/jboss-adapter-core/pom.xml
index 6c75512482c..c0f76e134b1 100755
--- a/adapters/spi/jboss-adapter-core/pom.xml
+++ b/adapters/spi/jboss-adapter-core/pom.xml
@@ -30,11 +30,6 @@
     <name>Common JBoss/Wildfly Core Classes</name>
     <description/>
 
-    <properties>
-        <maven.compiler.target>1.8</maven.compiler.target>
-        <maven.compiler.source>1.8</maven.compiler.source>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>org.jboss.logging</groupId>
diff --git a/adapters/spi/jetty-adapter-spi/pom.xml b/adapters/spi/jetty-adapter-spi/pom.xml
index 44a101f7bd9..5ace3b45db3 100755
--- a/adapters/spi/jetty-adapter-spi/pom.xml
+++ b/adapters/spi/jetty-adapter-spi/pom.xml
@@ -29,9 +29,6 @@
     <artifactId>keycloak-jetty-adapter-spi</artifactId>
     <name>Keycloak Jetty Adapter SPI</name>
     <properties>
-        <maven.compiler.target>1.8</maven.compiler.target>
-        <maven.compiler.source>1.8</maven.compiler.source>
-
         <jetty9.version>8.1.17.v20150415</jetty9.version>
         <keycloak.osgi.export>
             org.keycloak.adapters.jetty.spi.*
diff --git a/adapters/spi/servlet-adapter-spi/pom.xml b/adapters/spi/servlet-adapter-spi/pom.xml
index 6bb4ba198b6..7bcf89f63a2 100755
--- a/adapters/spi/servlet-adapter-spi/pom.xml
+++ b/adapters/spi/servlet-adapter-spi/pom.xml
@@ -31,9 +31,6 @@
     <description/>
 
     <properties>
-        <maven.compiler.target>1.8</maven.compiler.target>
-        <maven.compiler.source>1.8</maven.compiler.source>
-
         <keycloak.osgi.export>
             org.keycloak.adapters.servlet.*
         </keycloak.osgi.export>
diff --git a/adapters/spi/tomcat-adapter-spi/pom.xml b/adapters/spi/tomcat-adapter-spi/pom.xml
index 73392181362..b79ed74cac4 100755
--- a/adapters/spi/tomcat-adapter-spi/pom.xml
+++ b/adapters/spi/tomcat-adapter-spi/pom.xml
@@ -28,10 +28,6 @@
 
     <artifactId>keycloak-tomcat-adapter-spi</artifactId>
     <name>Keycloak Tomcat Adapter SPI</name>
-    <properties>
-        <maven.compiler.target>1.8</maven.compiler.target>
-        <maven.compiler.source>1.8</maven.compiler.source>
-    </properties>
     <description />
 
     <dependencies>
diff --git a/adapters/spi/undertow-adapter-spi/pom.xml b/adapters/spi/undertow-adapter-spi/pom.xml
index 729092d10e0..29aee9a2072 100755
--- a/adapters/spi/undertow-adapter-spi/pom.xml
+++ b/adapters/spi/undertow-adapter-spi/pom.xml
@@ -31,9 +31,6 @@
     <description/>
 
     <properties>
-        <maven.compiler.target>1.8</maven.compiler.target>
-        <maven.compiler.source>1.8</maven.compiler.source>
-
         <keycloak.osgi.export>
             org.keycloak.adapters.undertow.*
         </keycloak.osgi.export>
diff --git a/authz/client/pom.xml b/authz/client/pom.xml
index 0255a11e5e2..0a7d1f8f98e 100644
--- a/authz/client/pom.xml
+++ b/authz/client/pom.xml
@@ -18,9 +18,6 @@
     <description>KeyCloak AuthZ: Client API</description>
 
     <properties>
-        <maven.compiler.target>1.8</maven.compiler.target>
-        <maven.compiler.source>1.8</maven.compiler.source>
-
         <keycloak.osgi.export>
             org.keycloak.authorization.client.*
         </keycloak.osgi.export>
diff --git a/common/pom.xml b/common/pom.xml
index 56ab23b7e3f..d937e697189 100755
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -32,9 +32,6 @@
     <description>Common library and dependencies shared with server and all adapters</description>
 
     <properties>
-        <maven.compiler.target>1.8</maven.compiler.target>
-        <maven.compiler.source>1.8</maven.compiler.source>
-
         <timestamp>${maven.build.timestamp}</timestamp>
         <maven.build.timestamp.format>yyyy-MM-dd HH:mm</maven.build.timestamp.format>
         <keycloak.osgi.export>
diff --git a/core/pom.xml b/core/pom.xml
index 404f26ad59e..0ab99f34e44 100755
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -32,9 +32,6 @@
     <description/>
 
     <properties>
-        <maven.compiler.target>1.8</maven.compiler.target>
-        <maven.compiler.source>1.8</maven.compiler.source>
-
         <timestamp>${maven.build.timestamp}</timestamp>
         <maven.build.timestamp.format>yyyy-MM-dd HH:mm</maven.build.timestamp.format>
         <keycloak.osgi.export>
diff --git a/docs/building.md b/docs/building.md
index 5b635927fa3..abdf9ae7467 100644
--- a/docs/building.md
+++ b/docs/building.md
@@ -1,6 +1,6 @@
 ## Building from source
 
-Ensure you have JDK 8 (or newer), Maven 3.5.4 (or newer) and Git installed
+Ensure you have JDK 11 (or newer), Maven 3.5.4 (or newer) and Git installed
 
     java -version
     mvn -version
diff --git a/pom.xml b/pom.xml
index 81c15dbb328..49dca3125e1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -220,6 +220,11 @@
 
         <!-- Frontend -->
         <node.version>v16.13.2</node.version>
+
+        <!-- Minimum Java version supported for running Keycloak -->
+        <!-- maven.compiler.target and maven.compiler.source already set to 1.8 in the parent pom -->
+        <!-- other modules will configure a higher Java version (for example Quarkus) -->
+        <maven.compiler.release>8</maven.compiler.release>
     </properties>
 
     <url>http://keycloak.org</url>
diff --git a/saml-core-api/pom.xml b/saml-core-api/pom.xml
index d795409a1fe..43fe49d087d 100755
--- a/saml-core-api/pom.xml
+++ b/saml-core-api/pom.xml
@@ -31,9 +31,6 @@
     <description/>
 
     <properties>
-        <maven.compiler.target>1.8</maven.compiler.target>
-        <maven.compiler.source>1.8</maven.compiler.source>
-
         <timestamp>${maven.build.timestamp}</timestamp>
         <maven.build.timestamp.format>yyyy-MM-dd HH:mm</maven.build.timestamp.format>
     </properties>
diff --git a/saml-core/pom.xml b/saml-core/pom.xml
index c587b233309..7f17007259c 100755
--- a/saml-core/pom.xml
+++ b/saml-core/pom.xml
@@ -31,9 +31,6 @@
     <description/>
 
     <properties>
-        <maven.compiler.target>1.8</maven.compiler.target>
-        <maven.compiler.source>1.8</maven.compiler.source>
-
         <timestamp>${maven.build.timestamp}</timestamp>
         <skip.security-manager.tests>true</skip.security-manager.tests>
         <maven.build.timestamp.format>yyyy-MM-dd HH:mm</maven.build.timestamp.format>
diff --git a/testsuite/integration-arquillian/test-apps/pom.xml b/testsuite/integration-arquillian/test-apps/pom.xml
index 69230b2d63d..d8e063a41fe 100644
--- a/testsuite/integration-arquillian/test-apps/pom.xml
+++ b/testsuite/integration-arquillian/test-apps/pom.xml
@@ -25,9 +25,4 @@
         <module>cors</module>
         <module>spring-boot-adapter-app</module>
     </modules>
-
-    <properties>
-        <maven.compiler.target>1.8</maven.compiler.target>
-        <maven.compiler.source>1.8</maven.compiler.source>
-    </properties>
 </project>