From 40c38e01335d5337aa1a300968834f5b15e40712 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Barto=C5=A1?= Date: Fri, 6 Jan 2023 16:49:04 +0100 Subject: [PATCH] Fix dependencies in testsuite, adapters and Quarkus module --- Quarkus3 branch sync no. 11 (24.3.2023) Resolved conflicts: keycloak/adapters/oidc/spring-security/pom.xml - Modified --- adapters/oidc/jaxrs-oauth-client/pom.xml | 4 ++-- adapters/oidc/servlet-filter/pom.xml | 4 ++-- adapters/oidc/spring-security/pom.xml | 4 ++-- adapters/oidc/undertow/pom.xml | 4 ++-- adapters/oidc/wildfly-elytron/pom.xml | 4 ++-- adapters/saml/undertow/pom.xml | 4 ++-- adapters/spi/jboss-adapter-core/pom.xml | 4 ++-- adapters/spi/undertow-adapter-spi/pom.xml | 4 ++-- examples/kerberos/pom.xml | 4 ++-- examples/ldap/pom.xml | 4 ++-- pom.xml | 14 ++------------ quarkus/pom.xml | 2 +- quarkus/runtime/pom.xml | 2 +- testsuite/db-allocator-plugin/pom.xml | 5 +++++ .../test-apps/app-profile-jee/pom.xml | 4 ++-- .../test-apps/cors/database-service/pom.xml | 4 ++-- .../test-apps/photoz/photoz-restful-api/pom.xml | 4 ++-- testsuite/integration-arquillian/test-apps/pom.xml | 2 +- .../test-apps/servlet-authz/pom.xml | 4 ++-- .../test-apps/servlets/pom.xml | 6 ++---- .../test-apps/spring-boot-adapter-app/pom.xml | 6 ++++++ .../keys/JavaKeystoreKeyProviderTest.java | 2 +- .../org/keycloak/testsuite/util/MailServer.java | 2 +- testsuite/integration-arquillian/util/pom.xml | 7 ++++++- testsuite/utils/pom.xml | 4 ++++ 25 files changed, 58 insertions(+), 50 deletions(-) diff --git a/adapters/oidc/jaxrs-oauth-client/pom.xml b/adapters/oidc/jaxrs-oauth-client/pom.xml index bdf0c0a10b52..71851eb42c4e 100755 --- a/adapters/oidc/jaxrs-oauth-client/pom.xml +++ b/adapters/oidc/jaxrs-oauth-client/pom.xml @@ -71,8 +71,8 @@ provided - org.jboss.spec.javax.servlet - jboss-servlet-api_3.0_spec + jakarta.servlet + jakarta.servlet-api provided diff --git a/adapters/oidc/servlet-filter/pom.xml b/adapters/oidc/servlet-filter/pom.xml index 7cd29e60e8e9..84104c12056d 100755 --- a/adapters/oidc/servlet-filter/pom.xml +++ b/adapters/oidc/servlet-filter/pom.xml @@ -88,8 +88,8 @@ jackson-annotations - org.jboss.spec.javax.servlet - jboss-servlet-api_3.0_spec + jakarta.servlet + jakarta.servlet-api provided diff --git a/adapters/oidc/spring-security/pom.xml b/adapters/oidc/spring-security/pom.xml index a72e321e86a6..3cee2aa57fc4 100644 --- a/adapters/oidc/spring-security/pom.xml +++ b/adapters/oidc/spring-security/pom.xml @@ -55,8 +55,8 @@ keycloak-policy-enforcer - org.jboss.spec.javax.servlet - jboss-servlet-api_4.0_spec + jakarta.servlet + jakarta.servlet-api provided diff --git a/adapters/oidc/undertow/pom.xml b/adapters/oidc/undertow/pom.xml index d91c8eadf8d0..3cd802041e18 100755 --- a/adapters/oidc/undertow/pom.xml +++ b/adapters/oidc/undertow/pom.xml @@ -84,8 +84,8 @@ jackson-annotations - org.jboss.spec.javax.servlet - jboss-servlet-api_3.0_spec + jakarta.servlet + jakarta.servlet-api provided diff --git a/adapters/oidc/wildfly-elytron/pom.xml b/adapters/oidc/wildfly-elytron/pom.xml index f597b94cd1e7..2598590e9895 100755 --- a/adapters/oidc/wildfly-elytron/pom.xml +++ b/adapters/oidc/wildfly-elytron/pom.xml @@ -85,8 +85,8 @@ jackson-annotations - org.jboss.spec.javax.servlet - jboss-servlet-api_3.0_spec + jakarta.servlet + jakarta.servlet-api provided diff --git a/adapters/saml/undertow/pom.xml b/adapters/saml/undertow/pom.xml index b4d5480a78c1..408edd3e5026 100755 --- a/adapters/saml/undertow/pom.xml +++ b/adapters/saml/undertow/pom.xml @@ -67,8 +67,8 @@ provided - org.jboss.spec.javax.servlet - jboss-servlet-api_3.0_spec + jakarta.servlet + jakarta.servlet-api provided diff --git a/adapters/spi/jboss-adapter-core/pom.xml b/adapters/spi/jboss-adapter-core/pom.xml index 63fcbce25dd1..c5fd1ebd28aa 100755 --- a/adapters/spi/jboss-adapter-core/pom.xml +++ b/adapters/spi/jboss-adapter-core/pom.xml @@ -65,8 +65,8 @@ jackson-annotations - org.jboss.spec.javax.servlet - jboss-servlet-api_3.0_spec + jakarta.servlet + jakarta.servlet-api provided diff --git a/adapters/spi/undertow-adapter-spi/pom.xml b/adapters/spi/undertow-adapter-spi/pom.xml index 884b93c77400..4d959a96ffdf 100755 --- a/adapters/spi/undertow-adapter-spi/pom.xml +++ b/adapters/spi/undertow-adapter-spi/pom.xml @@ -56,8 +56,8 @@ keycloak-common - org.jboss.spec.javax.servlet - jboss-servlet-api_3.0_spec + jakarta.servlet + jakarta.servlet-api provided diff --git a/examples/kerberos/pom.xml b/examples/kerberos/pom.xml index b30ecd155ae9..985373bde0d7 100755 --- a/examples/kerberos/pom.xml +++ b/examples/kerberos/pom.xml @@ -35,8 +35,8 @@ - org.jboss.spec.javax.servlet - jboss-servlet-api_3.0_spec + jakarta.servlet + jakarta.servlet-api provided diff --git a/examples/ldap/pom.xml b/examples/ldap/pom.xml index 75b8aa9877af..9e2bd4c20513 100644 --- a/examples/ldap/pom.xml +++ b/examples/ldap/pom.xml @@ -33,8 +33,8 @@ - org.jboss.spec.javax.servlet - jboss-servlet-api_3.0_spec + jakarta.servlet + jakarta.servlet-api provided diff --git a/pom.xml b/pom.xml index 0c3f81595930..8cb33c59f5e3 100644 --- a/pom.xml +++ b/pom.xml @@ -168,7 +168,7 @@ 21.5.0.0 - 1.3.1b + 2.0.0-alpha-3 2.2 2.10 4.13.2 @@ -545,16 +545,6 @@ jackson-jaxrs-base ${jackson.version} - - org.jboss.spec.javax.servlet - jboss-servlet-api_3.0_spec - ${servlet.api.30.version} - - - org.jboss.spec.javax.servlet - jboss-servlet-api_4.0_spec - ${servlet.api.40.version} - org.picketlink picketlink-wildfly-common @@ -1039,7 +1029,7 @@ org.infinispan - infinispan-query-jakarta + infinispan-query-dsl ${infinispan.version} diff --git a/quarkus/pom.xml b/quarkus/pom.xml index 4c8a444a5e23..33a50095d8af 100644 --- a/quarkus/pom.xml +++ b/quarkus/pom.xml @@ -78,7 +78,7 @@ org.infinispan - infinispan-server-hotrod + infinispan-server-hotrod-jakarta ${infinispan.version} diff --git a/quarkus/runtime/pom.xml b/quarkus/runtime/pom.xml index 03e2f047d938..010a19526e02 100644 --- a/quarkus/runtime/pom.xml +++ b/quarkus/runtime/pom.xml @@ -481,7 +481,7 @@ org.infinispan - infinispan-server-hotrod + infinispan-server-hotrod-jakarta ${infinispan.version} diff --git a/testsuite/db-allocator-plugin/pom.xml b/testsuite/db-allocator-plugin/pom.xml index 878723d7f8ac..c82daf8462b7 100644 --- a/testsuite/db-allocator-plugin/pom.xml +++ b/testsuite/db-allocator-plugin/pom.xml @@ -56,6 +56,11 @@ org.jboss.resteasy resteasy-client + + commons-io + commons-io + 2.11.0 + junit diff --git a/testsuite/integration-arquillian/test-apps/app-profile-jee/pom.xml b/testsuite/integration-arquillian/test-apps/app-profile-jee/pom.xml index d25c47c91ca4..28bef531a1ce 100644 --- a/testsuite/integration-arquillian/test-apps/app-profile-jee/pom.xml +++ b/testsuite/integration-arquillian/test-apps/app-profile-jee/pom.xml @@ -20,8 +20,8 @@ - org.jboss.spec.javax.servlet - jboss-servlet-api_4.0_spec + jakarta.servlet + jakarta.servlet-api provided diff --git a/testsuite/integration-arquillian/test-apps/cors/database-service/pom.xml b/testsuite/integration-arquillian/test-apps/cors/database-service/pom.xml index bbb7e13db956..c4e69262f9b9 100755 --- a/testsuite/integration-arquillian/test-apps/cors/database-service/pom.xml +++ b/testsuite/integration-arquillian/test-apps/cors/database-service/pom.xml @@ -38,8 +38,8 @@ provided - org.jboss.spec.javax.servlet - jboss-servlet-api_3.0_spec + jakarta.servlet + jakarta.servlet-api provided diff --git a/testsuite/integration-arquillian/test-apps/photoz/photoz-restful-api/pom.xml b/testsuite/integration-arquillian/test-apps/photoz/photoz-restful-api/pom.xml index 851da7b1525e..616294c2c8cc 100755 --- a/testsuite/integration-arquillian/test-apps/photoz/photoz-restful-api/pom.xml +++ b/testsuite/integration-arquillian/test-apps/photoz/photoz-restful-api/pom.xml @@ -23,8 +23,8 @@ provided - org.jboss.spec.javax.servlet - jboss-servlet-api_3.0_spec + jakarta.servlet + jakarta.servlet-api provided diff --git a/testsuite/integration-arquillian/test-apps/pom.xml b/testsuite/integration-arquillian/test-apps/pom.xml index 795997edb86b..1a800222305c 100644 --- a/testsuite/integration-arquillian/test-apps/pom.xml +++ b/testsuite/integration-arquillian/test-apps/pom.xml @@ -23,6 +23,6 @@ servlets app-profile-jee cors - spring-boot-adapter-app + diff --git a/testsuite/integration-arquillian/test-apps/servlet-authz/pom.xml b/testsuite/integration-arquillian/test-apps/servlet-authz/pom.xml index a2b12820e213..0ceee874177e 100755 --- a/testsuite/integration-arquillian/test-apps/servlet-authz/pom.xml +++ b/testsuite/integration-arquillian/test-apps/servlet-authz/pom.xml @@ -30,8 +30,8 @@ provided - org.jboss.spec.javax.servlet - jboss-servlet-api_4.0_spec + jakarta.servlet + jakarta.servlet-api provided diff --git a/testsuite/integration-arquillian/test-apps/servlets/pom.xml b/testsuite/integration-arquillian/test-apps/servlets/pom.xml index 2c2bc6ef5220..7f739f1ad2aa 100644 --- a/testsuite/integration-arquillian/test-apps/servlets/pom.xml +++ b/testsuite/integration-arquillian/test-apps/servlets/pom.xml @@ -14,10 +14,8 @@ - org.jboss.spec.javax.servlet - jboss-servlet-api_3.0_spec - + jakarta.servlet + jakarta.servlet-api provided diff --git a/testsuite/integration-arquillian/test-apps/spring-boot-adapter-app/pom.xml b/testsuite/integration-arquillian/test-apps/spring-boot-adapter-app/pom.xml index 72c8ac751e70..2bcb5fb4d54b 100644 --- a/testsuite/integration-arquillian/test-apps/spring-boot-adapter-app/pom.xml +++ b/testsuite/integration-arquillian/test-apps/spring-boot-adapter-app/pom.xml @@ -49,6 +49,12 @@ org.keycloak keycloak-spring-boot-2-adapter + + + jakarta.servlet + jakarta.servlet-api + provided + diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/keys/JavaKeystoreKeyProviderTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/keys/JavaKeystoreKeyProviderTest.java index 1bec3422072b..e5f123b48a2a 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/keys/JavaKeystoreKeyProviderTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/keys/JavaKeystoreKeyProviderTest.java @@ -41,7 +41,7 @@ import jakarta.ws.rs.core.Response; import java.util.List; -import static io.smallrye.common.constraint.Assert.assertTrue; +import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; import static org.keycloak.common.util.KeystoreUtil.KeystoreFormat.PKCS12; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/MailServer.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/MailServer.java index 9e3d226495fd..362a5224055b 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/MailServer.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/MailServer.java @@ -63,7 +63,7 @@ public static void main(String[] args) throws Exception { log.info("-------------------------------------------------------"); } } - } catch (IOException | InterruptedException | MessagingException ex) { + } catch (IOException | MessagingException ex) { throw new RuntimeException(ex); } } diff --git a/testsuite/integration-arquillian/util/pom.xml b/testsuite/integration-arquillian/util/pom.xml index 744f6793ae8c..9a65e5226602 100644 --- a/testsuite/integration-arquillian/util/pom.xml +++ b/testsuite/integration-arquillian/util/pom.xml @@ -60,7 +60,7 @@ io.undertow.jastow jastow - 2.1.0.Final + 2.2.5.Final org.apache.commons @@ -92,5 +92,10 @@ sshd-core 2.7.0 + + jakarta.servlet + jakarta.servlet-api + provided + diff --git a/testsuite/utils/pom.xml b/testsuite/utils/pom.xml index 2cd8619418c8..1792eace8606 100755 --- a/testsuite/utils/pom.xml +++ b/testsuite/utils/pom.xml @@ -35,6 +35,10 @@ + + jakarta.mail + jakarta.mail-api + org.bouncycastle bcprov-jdk15on