Upgrade Keycloak to 25.0.1, usage of keycloak-cli-custom.sh is tempor…

…ary disabled (in keycloak-setup.sh)
inventage · Jun 28, 2024 · 9bacd3c · 9bacd3c
1 parent c0654ec
commit 9bacd3c
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 5 deletions.
diff --git a/config/src/main/resources/keycloak/bin/client/keycloak-config-cli-22.0.4.jar b/config/src/main/resources/keycloak/bin/client/keycloak-config-cli-22.0.4.jar
diff --git a/config/src/main/resources/keycloak/bin/client/keycloak-config-cli-23.0.1.jar b/config/src/main/resources/keycloak/bin/client/keycloak-config-cli-23.0.1.jar
diff --git a/...bin/client/keycloak-config-cli-24.0.1.jar → ...bin/client/keycloak-config-cli-25.0.1.jar b/...bin/client/keycloak-config-cli-24.0.1.jar → ...bin/client/keycloak-config-cli-25.0.1.jar
diff --git a/config/src/main/resources/keycloak/bin/keycloak-setup.sh b/config/src/main/resources/keycloak/bin/keycloak-setup.sh
@@ -60,7 +60,7 @@ runKeycloakConfigCli
 echo " "
 echo "----------------- KEYCLOAK CLI ------------------"
 echo " "
-runKeycloakCli
+# runKeycloakCli : temporary disabled because of error `Failed to create config file: /.keycloak/kcadm.config`
 
 echo " "
 echo "--------------- KEYCLOAK SETUP FINISHED ----------------"

diff --git a/container/pom.xml b/container/pom.xml
@@ -54,6 +54,14 @@
             <artifactId>postgresql</artifactId>
             <scope>test</scope>
         </dependency>
+        <!-- https://mvnrepository.com/artifact/commons-logging/commons-logging -->
+        <dependency>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+            <version>1.3.2</version>
+            <scope>test</scope>
+        </dependency>
+
     </dependencies>
 
     <build>

diff --git a/container/src/test/java/utils/KeycloakCustomContainer.java b/container/src/test/java/utils/KeycloakCustomContainer.java
@@ -1,6 +1,9 @@
 package utils;
 
 import dasniko.testcontainers.keycloak.ExtendableKeycloakContainer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.testcontainers.containers.output.Slf4jLogConsumer;
 import org.testcontainers.containers.wait.strategy.LogMessageWaitStrategy;
 import org.testcontainers.containers.wait.strategy.WaitStrategy;
 
@@ -13,6 +16,8 @@ public class KeycloakCustomContainer extends ExtendableKeycloakContainer<Keycloa
     private static final String DEFAULT_WAIT_LOG_REGEX = ".*KEYCLOAK SETUP FINISHED.*";
     private static final long DEFAULT_STARTUP_TIMEOUT = 3;
 
+    private static final Logger LOGGER = LoggerFactory.getLogger(KeycloakCustomContainer.class);
+
     public KeycloakCustomContainer(String dockerImageName, WaitStrategy waitStrategy, long startupTimeout) {
         super(dockerImageName);
         this.waitStrategy = waitStrategy;
@@ -26,10 +31,14 @@ public KeycloakCustomContainer(String dockerImageName){
                 .withRegEx(DEFAULT_WAIT_LOG_REGEX)
                 .withTimes(1)
                 .withStartupTimeout(Duration.ofMinutes(this.startupTimeout));
+        this.withLogConsumer(new Slf4jLogConsumer(LOGGER));
     }
+
     @Override
     protected void configure() {
         super.configure();
         setWaitStrategy(this.waitStrategy);
     }
+
+
 }
diff --git a/docker-compose/postgres/docker-compose.yml b/docker-compose/postgres/docker-compose.yml
@@ -9,7 +9,7 @@ services:
       - PGDATA=/var/lib/postgresql/data/pgdata
       - POSTGRES_PASSWORD=postgres
     volumes:
-      - ./volume/pgdata/:/var/lib/postgresql/data/pgdata
+      - ./volume/16/pgdata/:/var/lib/postgresql/data/pgdata
     networks:
       - postgres
 

diff --git a/pom.xml b/pom.xml
@@ -21,7 +21,7 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.release>17</maven.compiler.release>
+        <maven.compiler.release>21</maven.compiler.release>
         <keycloak.dir>./target/keycloak</keycloak.dir>
         <keycloak.target.dir>../server/${keycloak.dir}/</keycloak.target.dir> <!-- used in config & extension modules -->
         <keycloak.providers.dir>../../server/${keycloak.dir}/providers</keycloak.providers.dir> <!-- used in extension modules -->
@@ -32,8 +32,8 @@
         <docker.verbose>true</docker.verbose>
         <docker.imagePropertyConfiguration>override</docker.imagePropertyConfiguration>
         <!-- versions -->
-        <keycloak.version>24.0.4</keycloak.version> <!-- update also keycloak-config-cli.version -->
-        <keycloak-config-cli.version>24.0.1</keycloak-config-cli.version> <!-- from https://github.com/adorsys/keycloak-config-cli/releases -->
+        <keycloak.version>25.0.1</keycloak.version> <!-- update also keycloak-config-cli.version -->
+        <keycloak-config-cli.version>25.0.1</keycloak-config-cli.version> <!-- from https://github.com/adorsys/keycloak-config-cli/releases -->
         <auto-service.version>1.0.1</auto-service.version>
         <testcontainers-keycloak.version>3.1.0</testcontainers-keycloak.version>
         <testcontainers-postgres.version>1.19.3</testcontainers-postgres.version>