diff --git a/bom/application/pom.xml b/bom/application/pom.xml index 6d0d5cf2a08553..68755dffe178e4 100644 --- a/bom/application/pom.xml +++ b/bom/application/pom.xml @@ -183,7 +183,7 @@ 5.14.1 5.8.0 2.1.0 - 25.0.6 + 26.0.0 1.15.1 3.48.1 2.33.0 @@ -6116,41 +6116,20 @@ ${quarkus-spring-boot-api.version} - - org.keycloak - keycloak-core - ${keycloak.version} - - - org.keycloak - keycloak-common - ${keycloak.version} - org.keycloak keycloak-admin-client - ${keycloak.version} - - - org.checkerframework - checker-qual - - - - - org.keycloak - keycloak-adapter-spi - ${keycloak.version} + ${keycloak-client.version} org.keycloak keycloak-authz-client - ${keycloak.version} + ${keycloak-client.version} org.keycloak keycloak-policy-enforcer - ${keycloak.version} + ${keycloak-client.version} io.quarkus diff --git a/build-parent/pom.xml b/build-parent/pom.xml index 8775cba337be26..bd125e8045557c 100644 --- a/build-parent/pom.xml +++ b/build-parent/pom.xml @@ -95,10 +95,9 @@ 4.13.2 - - 25.0.6 + 25.0.6 19.0.3 - quay.io/keycloak/keycloak:${keycloak.version} + quay.io/keycloak/keycloak:${keycloak.test.server.version} quay.io/keycloak/keycloak:${keycloak.wildfly.version}-legacy 7.0.1 diff --git a/extensions/devservices/keycloak/pom.xml b/extensions/devservices/keycloak/pom.xml index a12beb74331f89..4d4cc28c13635d 100644 --- a/extensions/devservices/keycloak/pom.xml +++ b/extensions/devservices/keycloak/pom.xml @@ -34,7 +34,7 @@ org.keycloak - keycloak-core + keycloak-admin-client com.sun.activation diff --git a/extensions/keycloak-admin-rest-client/runtime/pom.xml b/extensions/keycloak-admin-rest-client/runtime/pom.xml index 7daec9e8543350..175cc28cbb2ac1 100644 --- a/extensions/keycloak-admin-rest-client/runtime/pom.xml +++ b/extensions/keycloak-admin-rest-client/runtime/pom.xml @@ -22,16 +22,6 @@ io.quarkus quarkus-tls-registry - - org.keycloak - keycloak-core - - - com.sun.activation - jakarta.activation - - - org.eclipse.angus angus-activation diff --git a/extensions/keycloak-admin-resteasy-client/runtime/pom.xml b/extensions/keycloak-admin-resteasy-client/runtime/pom.xml index dc3f73112bcf5c..cb9eb007af6f6d 100644 --- a/extensions/keycloak-admin-resteasy-client/runtime/pom.xml +++ b/extensions/keycloak-admin-resteasy-client/runtime/pom.xml @@ -30,16 +30,6 @@ io.quarkus quarkus-resteasy-client-jaxb - - org.keycloak - keycloak-core - - - com.sun.activation - jakarta.activation - - - org.eclipse.angus angus-activation diff --git a/extensions/keycloak-authorization/runtime/pom.xml b/extensions/keycloak-authorization/runtime/pom.xml index a49332d94f3ad7..64d92dd5df3106 100644 --- a/extensions/keycloak-authorization/runtime/pom.xml +++ b/extensions/keycloak-authorization/runtime/pom.xml @@ -22,29 +22,14 @@ io.quarkus quarkus-tls-registry - - org.keycloak - keycloak-core - - - com.sun.activation - jakarta.activation - - - org.keycloak keycloak-policy-enforcer - ${keycloak.version} org.eclipse.angus angus-activation - - org.keycloak - keycloak-adapter-spi - org.keycloak keycloak-authz-client diff --git a/extensions/oidc-client/deployment/pom.xml b/extensions/oidc-client/deployment/pom.xml index 3e96bb92c13c75..b5e2a208ac82c2 100644 --- a/extensions/oidc-client/deployment/pom.xml +++ b/extensions/oidc-client/deployment/pom.xml @@ -50,7 +50,7 @@ org.keycloak - keycloak-core + keycloak-admin-client test diff --git a/extensions/oidc/deployment/pom.xml b/extensions/oidc/deployment/pom.xml index 8e45ae8a28f43a..055766ca92a66d 100644 --- a/extensions/oidc/deployment/pom.xml +++ b/extensions/oidc/deployment/pom.xml @@ -41,6 +41,32 @@ io.quarkus quarkus-jsonp-deployment + + org.keycloak + keycloak-admin-client + + + org.jboss.resteasy + resteasy-client + + + org.jboss.resteasy + resteasy-multipart-provider + + + org.jboss.resteasy + resteasy-jackson2-provider + + + org.jboss.resteasy + resteasy-jaxb-provider + + + commons-logging + commons-logging + + + org.eclipse.angus angus-activation diff --git a/integration-tests/oidc-client-reactive/pom.xml b/integration-tests/oidc-client-reactive/pom.xml index 3ea6362e1a7f06..caab893e3c9404 100644 --- a/integration-tests/oidc-client-reactive/pom.xml +++ b/integration-tests/oidc-client-reactive/pom.xml @@ -19,16 +19,6 @@ - - org.keycloak - keycloak-core - - - com.sun.activation - jakarta.activation - - - org.eclipse.angus angus-activation diff --git a/integration-tests/oidc-client/pom.xml b/integration-tests/oidc-client/pom.xml index 5cb7970336c4d1..60d480cb25a3d4 100644 --- a/integration-tests/oidc-client/pom.xml +++ b/integration-tests/oidc-client/pom.xml @@ -22,7 +22,7 @@ org.keycloak - keycloak-core + keycloak-admin-client com.sun.activation diff --git a/integration-tests/oidc-code-flow/pom.xml b/integration-tests/oidc-code-flow/pom.xml index 5edca73ef37c8f..5ae6af0a249f1b 100644 --- a/integration-tests/oidc-code-flow/pom.xml +++ b/integration-tests/oidc-code-flow/pom.xml @@ -53,7 +53,7 @@ org.keycloak - keycloak-core + keycloak-admin-client com.sun.activation diff --git a/integration-tests/oidc-tenancy/pom.xml b/integration-tests/oidc-tenancy/pom.xml index efc494393105d6..df9423c3989ae5 100644 --- a/integration-tests/oidc-tenancy/pom.xml +++ b/integration-tests/oidc-tenancy/pom.xml @@ -32,7 +32,7 @@ org.keycloak - keycloak-core + keycloak-admin-client com.sun.activation diff --git a/integration-tests/oidc-token-propagation/pom.xml b/integration-tests/oidc-token-propagation/pom.xml index 96757a10b93818..6e66b9a32e7645 100644 --- a/integration-tests/oidc-token-propagation/pom.xml +++ b/integration-tests/oidc-token-propagation/pom.xml @@ -20,7 +20,7 @@ org.keycloak - keycloak-core + keycloak-admin-client com.sun.activation diff --git a/integration-tests/oidc/pom.xml b/integration-tests/oidc/pom.xml index ff0b6fdd56069d..186b804956872a 100644 --- a/integration-tests/oidc/pom.xml +++ b/integration-tests/oidc/pom.xml @@ -31,6 +31,17 @@ quarkus-test-keycloak-server test + + org.keycloak + keycloak-admin-client + test + + + com.sun.activation + jakarta.activation + + + org.eclipse.angus angus-activation @@ -40,7 +51,7 @@ quarkus-test-security-oidc test - + io.quarkus quarkus-junit5 @@ -150,7 +161,7 @@ false - ${keycloak.version} + ${keycloak.test.server.version} @@ -159,7 +170,7 @@ false - ${keycloak.version} + ${keycloak.test.server.version} diff --git a/integration-tests/smallrye-jwt-oidc-webapp/pom.xml b/integration-tests/smallrye-jwt-oidc-webapp/pom.xml index 802c1498e549c5..bb0272b80dde6d 100644 --- a/integration-tests/smallrye-jwt-oidc-webapp/pom.xml +++ b/integration-tests/smallrye-jwt-oidc-webapp/pom.xml @@ -30,7 +30,7 @@ org.keycloak - keycloak-core + keycloak-admin-client com.sun.activation diff --git a/integration-tests/smallrye-jwt-token-propagation/pom.xml b/integration-tests/smallrye-jwt-token-propagation/pom.xml index 40ec80ae748341..3c21ec927702b8 100644 --- a/integration-tests/smallrye-jwt-token-propagation/pom.xml +++ b/integration-tests/smallrye-jwt-token-propagation/pom.xml @@ -21,7 +21,7 @@ org.keycloak - keycloak-core + keycloak-admin-client com.sun.activation diff --git a/test-framework/keycloak-server/pom.xml b/test-framework/keycloak-server/pom.xml index 704f2b9e244816..0ba172a85bdd54 100644 --- a/test-framework/keycloak-server/pom.xml +++ b/test-framework/keycloak-server/pom.xml @@ -15,7 +15,7 @@ org.keycloak - keycloak-core + keycloak-admin-client com.sun.activation