Update to Keycloak 25.0.1

Signed-off-by: Thomas Darimont <[email protected]>

deployments/local/dev/docker-compose-keycloakx.yml

@@ -109,7 +109,7 @@ services:
       - ../../../keycloak/config/openid-config.json:/opt/keycloak/conf/openid-config.json:z
       - ../../../keycloak/config/jmxremote.password:/opt/keycloak/conf/jmxremote.password:ro
       - ../../../keycloak/imex:/opt/keycloak/imex:z
-      - ./run/keycloakx/data:/opt/keycloak/data25:z
+      - ./run/keycloakx/data:/opt/keycloak/data:z
       - ./run/keycloakx/logs:/opt/keycloak/logs:z
       - ./run/keycloakx/perf:/opt/keycloak/perf:z
 # Add keycloak extensions

deployments/local/dev/docker-compose-provisioning.yml

@@ -1,6 +1,7 @@
 services:
   acme-keycloak-provisioning:
-    image: quay.io/adorsys/keycloak-config-cli:6.0.0
+#    image: quay.io/adorsys/keycloak-config-cli:6.0.2-24.0.5
+    image: docker.io/library/keycloak-config-cli:6.0.3-25.0.1-SNAPSHOT2
     env_file:
 # generated via start.java
       - ./../../../generated.env.tmp

deployments/local/dev/keycloakx/Dockerfile

@@ -1,5 +1,5 @@
 #see https://www.keycloak.org/server/containers
-ARG KEYCLOAK_VERSION=25.0.0
+ARG KEYCLOAK_VERSION=25.0.1
 FROM quay.io/keycloak/keycloak:$KEYCLOAK_VERSION
 #FROM thomasdarimont/keycloak:21.0.999.1
 USER root

deployments/local/dev/keycloakx/Dockerfile-ci

@@ -1,5 +1,5 @@
 #see https://www.keycloak.org/server/containers
-ARG KEYCLOAK_VERSION=25.0.0
+ARG KEYCLOAK_VERSION=25.0.1
 FROM quay.io/keycloak/keycloak:$KEYCLOAK_VERSION
 USER root
 

deployments/local/standalone/keycloak/Dockerfile

@@ -1,5 +1,5 @@
 #see https://www.keycloak.org/server/containers
-ARG KEYCLOAK_VERSION=25.0.0
+ARG KEYCLOAK_VERSION=25.0.1
 FROM quay.io/keycloak/keycloak:$KEYCLOAK_VERSION
 
 USER root

keycloak.env

@@ -1,5 +1,5 @@
 # Global configuration for Keycloak environment
-KEYCLOAK_VERSION=25.0.0
+KEYCLOAK_VERSION=25.0.1
 KEYCLOAK_CONFIG_FILE=standalone.xml
 USER=1000
 GROUP=1000

keycloak/docker/src/main/docker/keycloakx/Dockerfile.ci.plain

@@ -1,4 +1,4 @@
-ARG KEYCLOAK_VERSION=25.0.0
+ARG KEYCLOAK_VERSION=25.0.1
 FROM quay.io/keycloak/keycloak:$KEYCLOAK_VERSION
 
 ENV KC_FEATURES=preview

keycloak/docker/src/main/docker/keycloakx/Dockerfile.plain

@@ -1,4 +1,4 @@
-ARG KEYCLOAK_VERSION=25.0.0
+ARG KEYCLOAK_VERSION=25.0.1
 FROM quay.io/keycloak/keycloak:$KEYCLOAK_VERSION
 
 USER root

keycloak/extensions/pom.xml

@@ -19,7 +19,8 @@
         <microprofile-health-api.version>4.0.1</microprofile-health-api.version>
         <micrometer.version>1.12.2</micrometer.version>
         <httpcomponents.version>4.5.14</httpcomponents.version>
-        <jnats.version>2.17.6</jnats.version>
+        <jnats.version>2.19.1</jnats.version>
+        <resteasy.version>6.2.9.Final</resteasy.version>
     </properties>
 
     <dependencies>
@@ -74,13 +75,6 @@
             </exclusions>
         </dependency>
 
-        <dependency>
-            <groupId>org.jboss.resteasy</groupId>
-            <artifactId>resteasy-multipart-provider</artifactId>
-            <version>${resteasy.version}</version>
-            <scope>provided</scope>
-        </dependency>
-
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
@@ -158,19 +152,25 @@
             </exclusions>
         </dependency>
 
+        <dependency>
+            <groupId>org.jboss.resteasy</groupId>
+            <artifactId>resteasy-multipart-provider</artifactId>
+            <version>${resteasy.version}</version>
+            <scope>test</scope>
+        </dependency>
 
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-client</artifactId>
             <version>${resteasy.version}</version>
-            <scope>provided</scope>
+            <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-jackson2-provider</artifactId>
             <version>${resteasy.version}</version>
-            <scope>provided</scope>
+            <scope>test</scope>
         </dependency>
 
         <dependency>

keycloak/extensions/src/test/java/com/github/thomasdarimont/keycloak/custom/KeycloakTestSupport.java

@@ -42,7 +42,7 @@ public static KeycloakContainer createKeycloakContainer() {
     }
 
     public static KeycloakContainer createKeycloakContainer(String realmImportFileName) {
-        return createKeycloakContainer("quay.io/keycloak/keycloak:25.0.0", realmImportFileName);
+        return createKeycloakContainer("quay.io/keycloak/keycloak:25.0.1", realmImportFileName);
     }
 
     public static KeycloakContainer createKeycloakContainer(String imageName, String realmImportFileName) {
@@ -104,7 +104,7 @@ public static UserRef createOrUpdateTestUser(RealmResource realm, String usernam
     public static GenericContainer<?> createKeycloakConfigCliContainer(KeycloakContainer keycloakContainer) {
 
         var keycloakConfigCli = new GenericContainer<>(
-                "quay.io/adorsys/keycloak-config-cli:6.0.0"
+                "quay.io/adorsys/keycloak-config-cli:6.0.2-24.0.5"
         );
         keycloakConfigCli.addEnv("KEYCLOAK_AVAILABILITYCHECK_ENABLED", "true");
         keycloakConfigCli.addEnv("KEYCLOAK_AVAILABILITYCHECK_TIMEOUT", "90s");

pom.xml

@@ -46,7 +46,7 @@
         <docker.file>keycloakx/Dockerfile.plain</docker.file>
 
         <!-- Keycloak -->
-        <keycloak.version>24.0.5</keycloak.version>
+        <keycloak.version>25.0.1</keycloak.version>
 
         <!-- Parameterizable Project Versions -->
         <revision>1.0.0</revision>
@@ -58,7 +58,6 @@
         <!-- Testing -->
         <junit-jupiter.version>5.9.2</junit-jupiter.version>
         <assertj-core.version>3.24.2</assertj-core.version>
-        <resteasy.version>6.2.7.Final</resteasy.version>
         <testcontainers-keycloak.version>3.3.1</testcontainers-keycloak.version>
 
         <!-- Tooling -->