From df18629ffef10c0ef82036c4203e5c5494ac3c72 Mon Sep 17 00:00:00 2001 From: Jon Koops Date: Fri, 21 Jun 2024 14:19:31 +0200 Subject: [PATCH] Use a default Java version from root POM (#29927) Signed-off-by: Jon Koops --- adapters/saml/core-jakarta/pom.xml | 2 + adapters/saml/core-public/pom.xml | 2 + .../profile/ecp/EcpAuthenticationHandler.java | 14 ++-- adapters/saml/wildfly-elytron-jakarta/pom.xml | 2 + .../wildfly/wildfly-jakarta-subsystem/pom.xml | 2 + adapters/spi/adapter-spi/pom.xml | 2 + adapters/spi/jboss-adapter-core/pom.xml | 5 ++ adapters/spi/undertow-adapter-spi/pom.xml | 2 + common/pom.xml | 2 + core/pom.xml | 2 + crypto/default/pom.xml | 5 ++ crypto/fips1402/pom.xml | 6 -- distribution/api-docs-dist/pom.xml | 2 - .../documentation/header-maven-plugin/pom.xml | 1 - docs/documentation/pom.xml | 12 --- docs/guides/pom.xml | 3 - docs/maven-plugin/pom.xml | 6 -- federation/ldap/pom.xml | 6 -- federation/sssd/pom.xml | 7 +- model/infinispan/pom.xml | 5 -- model/jpa/pom.xml | 4 - operator/pom.xml | 8 -- pom.xml | 73 ++++++------------- quarkus/deployment/pom.xml | 1 + quarkus/pom.xml | 16 ---- quarkus/runtime/pom.xml | 1 + saml-core-api/pom.xml | 2 + saml-core/pom.xml | 2 + server-spi/pom.xml | 6 -- services/pom.xml | 4 - test-poc/pom.xml | 6 -- .../servers/adapter-spi/pom.xml | 16 +--- .../services/testsuite-providers/pom.xml | 4 - .../integration-arquillian/tests/base/pom.xml | 12 --- .../tests/other/sssd/pom.xml | 3 - .../tests/other/webauthn/pom.xml | 3 - .../integration-arquillian/tests/pom.xml | 24 +----- testsuite/model/pom.xml | 4 - 38 files changed, 65 insertions(+), 212 deletions(-) diff --git a/adapters/saml/core-jakarta/pom.xml b/adapters/saml/core-jakarta/pom.xml index 0d02b6f1ea..59e755159c 100644 --- a/adapters/saml/core-jakarta/pom.xml +++ b/adapters/saml/core-jakarta/pom.xml @@ -14,6 +14,8 @@ Keycloak SAML Client Adapter Core Jakarta + + 11 ${maven.build.timestamp} yyyy-MM-dd HH:mm diff --git a/adapters/saml/core-public/pom.xml b/adapters/saml/core-public/pom.xml index a5e4e0aa3f..94d354283e 100755 --- a/adapters/saml/core-public/pom.xml +++ b/adapters/saml/core-public/pom.xml @@ -32,6 +32,8 @@ + + 11 ${maven.build.timestamp} yyyy-MM-dd HH:mm diff --git a/adapters/saml/core/src/main/java/org/keycloak/adapters/saml/profile/ecp/EcpAuthenticationHandler.java b/adapters/saml/core/src/main/java/org/keycloak/adapters/saml/profile/ecp/EcpAuthenticationHandler.java index 375e2625ce..61ec5f8f19 100644 --- a/adapters/saml/core/src/main/java/org/keycloak/adapters/saml/profile/ecp/EcpAuthenticationHandler.java +++ b/adapters/saml/core/src/main/java/org/keycloak/adapters/saml/profile/ecp/EcpAuthenticationHandler.java @@ -36,13 +36,13 @@ import org.keycloak.saml.processing.web.util.PostBindingUtil; import org.w3c.dom.Document; import org.w3c.dom.Node; -import javax.xml.soap.MessageFactory; -import javax.xml.soap.SOAPBody; -import javax.xml.soap.SOAPEnvelope; -import javax.xml.soap.SOAPException; -import javax.xml.soap.SOAPHeader; -import javax.xml.soap.SOAPHeaderElement; -import javax.xml.soap.SOAPMessage; +import jakarta.xml.soap.MessageFactory; +import jakarta.xml.soap.SOAPBody; +import jakarta.xml.soap.SOAPEnvelope; +import jakarta.xml.soap.SOAPException; +import jakarta.xml.soap.SOAPHeader; +import jakarta.xml.soap.SOAPHeaderElement; +import jakarta.xml.soap.SOAPMessage; /** * @author Pedro Igor diff --git a/adapters/saml/wildfly-elytron-jakarta/pom.xml b/adapters/saml/wildfly-elytron-jakarta/pom.xml index b112bc08e2..7a6ea8c01c 100755 --- a/adapters/saml/wildfly-elytron-jakarta/pom.xml +++ b/adapters/saml/wildfly-elytron-jakarta/pom.xml @@ -36,6 +36,8 @@ Reason is the transition to Jakarta APIs. --> + + 11 ${project.basedir}/../wildfly-elytron/src ${project.basedir}/src diff --git a/adapters/saml/wildfly/wildfly-jakarta-subsystem/pom.xml b/adapters/saml/wildfly/wildfly-jakarta-subsystem/pom.xml index 640531d7eb..ba3f9e93ab 100755 --- a/adapters/saml/wildfly/wildfly-jakarta-subsystem/pom.xml +++ b/adapters/saml/wildfly/wildfly-jakarta-subsystem/pom.xml @@ -36,6 +36,8 @@ Reason is the transition to Jakarta APIs. --> + + 11 ${project.basedir}/../wildfly-subsystem/src ${project.basedir}/src diff --git a/adapters/spi/adapter-spi/pom.xml b/adapters/spi/adapter-spi/pom.xml index aab344d284..cad99b9e45 100755 --- a/adapters/spi/adapter-spi/pom.xml +++ b/adapters/spi/adapter-spi/pom.xml @@ -31,6 +31,8 @@ + + 11 org.keycloak.adapters.spi.* diff --git a/adapters/spi/jboss-adapter-core/pom.xml b/adapters/spi/jboss-adapter-core/pom.xml index a184ae5e0d..6978a6d20c 100755 --- a/adapters/spi/jboss-adapter-core/pom.xml +++ b/adapters/spi/jboss-adapter-core/pom.xml @@ -30,6 +30,11 @@ Common JBoss/Wildfly Core Classes + + + 11 + + org.jboss.logging diff --git a/adapters/spi/undertow-adapter-spi/pom.xml b/adapters/spi/undertow-adapter-spi/pom.xml index 884b93c774..2b66f60cd9 100755 --- a/adapters/spi/undertow-adapter-spi/pom.xml +++ b/adapters/spi/undertow-adapter-spi/pom.xml @@ -31,6 +31,8 @@ + + 11 org.keycloak.adapters.undertow.* diff --git a/common/pom.xml b/common/pom.xml index 5f644cbc0a..84ba888537 100755 --- a/common/pom.xml +++ b/common/pom.xml @@ -32,6 +32,8 @@ Common library and dependencies shared with server and all adapters + + 11 ${maven.build.timestamp} yyyy-MM-dd HH:mm diff --git a/core/pom.xml b/core/pom.xml index 5d1f8600b6..04643f931c 100755 --- a/core/pom.xml +++ b/core/pom.xml @@ -32,6 +32,8 @@ + + 11 ${maven.build.timestamp} yyyy-MM-dd HH:mm diff --git a/crypto/default/pom.xml b/crypto/default/pom.xml index 2b0cf1fb23..33aa7a62f5 100644 --- a/crypto/default/pom.xml +++ b/crypto/default/pom.xml @@ -30,6 +30,11 @@ Keycloak Crypto Default + + + 11 + + org.keycloak diff --git a/crypto/fips1402/pom.xml b/crypto/fips1402/pom.xml index 7691a0f128..dab8c4724b 100644 --- a/crypto/fips1402/pom.xml +++ b/crypto/fips1402/pom.xml @@ -30,12 +30,6 @@ Keycloak Crypto FIPS 140-2 Integration - - 17 - 17 - 17 - - org.keycloak diff --git a/distribution/api-docs-dist/pom.xml b/distribution/api-docs-dist/pom.xml index d2d67f4060..801618de53 100755 --- a/distribution/api-docs-dist/pom.xml +++ b/distribution/api-docs-dist/pom.xml @@ -31,7 +31,6 @@ Keycloak ${project.version} - 17 @@ -81,7 +80,6 @@ 2400m UTF-8 true - ${maven.compiler.source} true true diff --git a/docs/documentation/header-maven-plugin/pom.xml b/docs/documentation/header-maven-plugin/pom.xml index ff6ef9310a..0bd4fe4064 100644 --- a/docs/documentation/header-maven-plugin/pom.xml +++ b/docs/documentation/header-maven-plugin/pom.xml @@ -48,7 +48,6 @@ org.apache.maven.plugins maven-plugin-plugin - ${maven.plugins.version} header true diff --git a/docs/documentation/pom.xml b/docs/documentation/pom.xml index d228d63f1a..aae4b5da34 100644 --- a/docs/documentation/pom.xml +++ b/docs/documentation/pom.xml @@ -29,9 +29,6 @@ 2.5.2 2.22.2 4.0.0 - - 1.8 - 1.8 @@ -64,15 +61,6 @@ - - org.apache.maven.plugins - maven-compiler-plugin - ${version.compiler.plugin} - - ${maven.compiler.target} - ${maven.compiler.source} - - org.apache.maven.plugins maven-jar-plugin diff --git a/docs/guides/pom.xml b/docs/guides/pom.xml index 050466394d..ee41550a9b 100644 --- a/docs/guides/pom.xml +++ b/docs/guides/pom.xml @@ -41,9 +41,6 @@ - - maven-compiler-plugin - maven-resources-plugin 3.3.0 diff --git a/docs/maven-plugin/pom.xml b/docs/maven-plugin/pom.xml index 2c07a98d44..67925550f0 100644 --- a/docs/maven-plugin/pom.xml +++ b/docs/maven-plugin/pom.xml @@ -31,12 +31,6 @@ Keycloak Guides Maven Plugin maven-plugin - - 17 - 17 - 17 - - org.apache.maven diff --git a/federation/ldap/pom.xml b/federation/ldap/pom.xml index 6d976016a8..25d4e22833 100755 --- a/federation/ldap/pom.xml +++ b/federation/ldap/pom.xml @@ -29,12 +29,6 @@ Keycloak LDAP UserStoreProvider - - 17 - 17 - 17 - - org.keycloak diff --git a/federation/sssd/pom.xml b/federation/sssd/pom.xml index 72e1c71365..6f1b1ee036 100644 --- a/federation/sssd/pom.xml +++ b/federation/sssd/pom.xml @@ -9,12 +9,6 @@ 4.0.0 - - 17 - 17 - 17 - - keycloak-sssd-federation Keycloak SSSD Federation @@ -46,6 +40,7 @@ + org.apache.maven.plugins maven-compiler-plugin diff --git a/model/infinispan/pom.xml b/model/infinispan/pom.xml index de58eb58f8..5b5c51c65a 100755 --- a/model/infinispan/pom.xml +++ b/model/infinispan/pom.xml @@ -23,11 +23,6 @@ org.keycloak 999.0.0-SNAPSHOT - - 17 - 17 - 17 - 4.0.0 diff --git a/model/jpa/pom.xml b/model/jpa/pom.xml index ac4e28f787..734bdb27c8 100755 --- a/model/jpa/pom.xml +++ b/model/jpa/pom.xml @@ -30,10 +30,6 @@ - 17 - 17 - 17 - org.h2.Driver keycloak sa diff --git a/operator/pom.xml b/operator/pom.xml index 329f0a9dfe..6d4b6cc1f4 100644 --- a/operator/pom.xml +++ b/operator/pom.xml @@ -15,11 +15,7 @@ keycloak-operator - 3.8.1 true - 17 - 17 - 17 UTF-8 UTF-8 keycloak @@ -155,10 +151,6 @@ quarkus-maven-plugin ${quarkus.build.version} - - maven-compiler-plugin - ${compiler-plugin.version} - diff --git a/pom.xml b/pom.xml index 6bb198c368..42c52b056b 100644 --- a/pom.xml +++ b/pom.xml @@ -35,6 +35,12 @@ pom + + 3.9.8 + 17 + 17 + 17 + 999.0.0-SNAPSHOT 1.5.8 @@ -183,8 +189,7 @@ 3.22.0 - 3.9.8 - 3.11.0 + 3.13.1 1.4.1 7.5.Final 1.9.0 @@ -207,7 +212,11 @@ 96m 512m -Xms${surefire.memory.Xms} -Xmx${surefire.memory.Xmx} -XX:MetaspaceSize=${surefire.memory.metaspace} -XX:MaxMetaspaceSize=${surefire.memory.metaspace.max} - + + + --add-opens=java.base/java.lang=ALL-UNNAMED + --add-opens=java.base/java.util=ALL-UNNAMED + 0.21.5.RELEASE @@ -1542,6 +1551,15 @@ true + + org.apache.maven.plugins + maven-javadoc-plugin + + none + false + cx.*:org.freedesktop*:org.jvnet* + + com.lazerycode.jmeter jmeter-maven-plugin @@ -1733,19 +1751,6 @@ - - jdk9 - - [9,) - - - - --add-opens=java.base/java.lang=ALL-UNNAMED - --add-opens=java.base/java.util=ALL-UNNAMED - - - - testsuite @@ -1836,42 +1841,6 @@ - - doclint-java8-disable - - [1.8,) - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - - none - false - cx.*:org.freedesktop*:org.jvnet* - - - - - - - - built-with-jdk-9-or-later - - - - (9,) - - - - - - 8 - - - nexus-staging diff --git a/quarkus/deployment/pom.xml b/quarkus/deployment/pom.xml index fcad78bde1..8047ab4aa5 100644 --- a/quarkus/deployment/pom.xml +++ b/quarkus/deployment/pom.xml @@ -181,6 +181,7 @@ + org.apache.maven.plugins maven-compiler-plugin diff --git a/quarkus/pom.xml b/quarkus/pom.xml index 4c0a5c76ca..b561e444e2 100644 --- a/quarkus/pom.xml +++ b/quarkus/pom.xml @@ -32,23 +32,7 @@ UTF-8 - 3.8.1 - 17 - 17 - 17 - - - - - - org.apache.maven.plugins - maven-compiler-plugin - ${maven.compiler.plugin.version} - - - - config-api diff --git a/quarkus/runtime/pom.xml b/quarkus/runtime/pom.xml index 79d4b4617b..2be4670b38 100644 --- a/quarkus/runtime/pom.xml +++ b/quarkus/runtime/pom.xml @@ -631,6 +631,7 @@ + org.apache.maven.plugins maven-compiler-plugin diff --git a/saml-core-api/pom.xml b/saml-core-api/pom.xml index 392c6b495f..186a56010c 100755 --- a/saml-core-api/pom.xml +++ b/saml-core-api/pom.xml @@ -31,6 +31,8 @@ + + 11 ${maven.build.timestamp} yyyy-MM-dd HH:mm diff --git a/saml-core/pom.xml b/saml-core/pom.xml index 6d1097dc55..aee0a23892 100755 --- a/saml-core/pom.xml +++ b/saml-core/pom.xml @@ -31,6 +31,8 @@ + + 11 ${maven.build.timestamp} true yyyy-MM-dd HH:mm diff --git a/server-spi/pom.xml b/server-spi/pom.xml index 2d8133333f..0dcc733f15 100755 --- a/server-spi/pom.xml +++ b/server-spi/pom.xml @@ -30,12 +30,6 @@ Keycloak Server SPI - - 17 - 17 - 17 - - jakarta.transaction diff --git a/services/pom.xml b/services/pom.xml index 0819d0b6b2..31733aa923 100755 --- a/services/pom.xml +++ b/services/pom.xml @@ -32,10 +32,6 @@ 1.1.2 - 3.8.1 - 17 - 17 - 17 diff --git a/test-poc/pom.xml b/test-poc/pom.xml index 94892e8552..99067f07ff 100755 --- a/test-poc/pom.xml +++ b/test-poc/pom.xml @@ -32,12 +32,6 @@ Keycloak Test Parent Keycloak Test Parent - - 17 - 17 - 17 - - base framework diff --git a/testsuite/integration-arquillian/servers/adapter-spi/pom.xml b/testsuite/integration-arquillian/servers/adapter-spi/pom.xml index 76a5fb9491..192df4b86b 100644 --- a/testsuite/integration-arquillian/servers/adapter-spi/pom.xml +++ b/testsuite/integration-arquillian/servers/adapter-spi/pom.xml @@ -18,19 +18,7 @@ - -Dnone + + -Djava.security.manager=allow - - - - jdk17+ - - [17,) - - - - -Djava.security.manager=allow - - - diff --git a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/pom.xml b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/pom.xml index fb61e10e88..b908215875 100644 --- a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/pom.xml +++ b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/pom.xml @@ -33,10 +33,6 @@ ${project.version} ${project.basedir}/target/classes/javascript - 3.8.1 - 17 - 17 - 17 diff --git a/testsuite/integration-arquillian/tests/base/pom.xml b/testsuite/integration-arquillian/tests/base/pom.xml index c3a6a249a8..0bb8f5188c 100644 --- a/testsuite/integration-arquillian/tests/base/pom.xml +++ b/testsuite/integration-arquillian/tests/base/pom.xml @@ -45,10 +45,6 @@ 2.5.2.Final 1.19.0 ${basedir}/../../servers/auth-server/common - 3.8.1 - 17 - 17 - 17 @@ -451,10 +447,6 @@ - - maven-compiler-plugin - ${maven-compiler-plugin.version} - @@ -823,10 +815,6 @@ - - maven-compiler-plugin - ${maven-compiler-plugin.version} - diff --git a/testsuite/integration-arquillian/tests/other/sssd/pom.xml b/testsuite/integration-arquillian/tests/other/sssd/pom.xml index abf95fde1c..ff80d347fb 100644 --- a/testsuite/integration-arquillian/tests/other/sssd/pom.xml +++ b/testsuite/integration-arquillian/tests/other/sssd/pom.xml @@ -15,9 +15,6 @@ **/sssd/**/*Test.java - 11 - 11 - 11 diff --git a/testsuite/integration-arquillian/tests/other/webauthn/pom.xml b/testsuite/integration-arquillian/tests/other/webauthn/pom.xml index 509477a0e4..3d1d400a99 100644 --- a/testsuite/integration-arquillian/tests/other/webauthn/pom.xml +++ b/testsuite/integration-arquillian/tests/other/webauthn/pom.xml @@ -14,9 +14,6 @@ ${project.build.directory}/dependency/firefox-user-preferences.js - 17 - 17 - 17 diff --git a/testsuite/integration-arquillian/tests/pom.xml b/testsuite/integration-arquillian/tests/pom.xml index 00de5983f1..4a65bc9d1f 100644 --- a/testsuite/integration-arquillian/tests/pom.xml +++ b/testsuite/integration-arquillian/tests/pom.xml @@ -77,7 +77,7 @@ ${auth.server.config.dir}/keycloak.jks secret jks - + ${default.modular.jvm.options} integration-arquillian-servers-auth-server-${auth.server} ${auth.server.undertow} @@ -132,7 +132,7 @@ secret ${app.server.keystore.dir}/adapter.jks secret - + ${default.modular.jvm.options} false ${containers.home}/cache-server-${cache.server} @@ -1898,26 +1898,6 @@ - - java11-auth-server - - [11,) - - - ${default.modular.jvm.options} - - - - - java11-app-server - - [11,) - - - ${default.modular.jvm.options} - - - java7-app-server diff --git a/testsuite/model/pom.xml b/testsuite/model/pom.xml index 2f33ddfaa0..fa1b2a507b 100644 --- a/testsuite/model/pom.xml +++ b/testsuite/model/pom.xml @@ -15,10 +15,6 @@ jar - 17 - 17 - 17 - org.h2.Driver keycloak sa