Downgrade Keycloak to 23.0.7 - Fixes: #2061

Hyperfoil · Oct 4, 2024 · 0f1c56b · 0f1c56b
1 parent 046ea7a
commit 0f1c56b
Show file tree

Hide file tree

Showing 8 changed files with 95 additions and 22 deletions.
diff --git a/horreum-backend/pom.xml b/horreum-backend/pom.xml
@@ -150,6 +150,20 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-keycloak-admin-resteasy-client</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>org.keycloak</groupId>
+            <artifactId>keycloak-admin-client</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.keycloak</groupId>
+            <artifactId>keycloak-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.keycloak</groupId>
+            <artifactId>keycloak-common</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-elasticsearch-rest-client</artifactId>
@@ -164,10 +178,6 @@
             <artifactId>commons-math3</artifactId>
             <version>${commons.math3.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-admin-client</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.testcontainers</groupId>
             <artifactId>postgresql</artifactId>

diff --git a/horreum-integration-tests/pom.xml b/horreum-integration-tests/pom.xml
@@ -33,12 +33,18 @@
         <dependency>
             <groupId>io.hyperfoil.tools</groupId>
             <artifactId>horreum-backend</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>io.quarkus</groupId>
-                    <artifactId>quarkus-keycloak-admin-client</artifactId>
-                </exclusion>
-            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.keycloak</groupId>
+            <artifactId>keycloak-admin-client</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.keycloak</groupId>
+            <artifactId>keycloak-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.keycloak</groupId>
+            <artifactId>keycloak-common</artifactId>
         </dependency>
         <dependency>
             <groupId>io.hyperfoil.tools</groupId>

diff --git a/horreum-web/package-lock.json b/horreum-web/package-lock.json
diff --git a/horreum-web/package.json b/horreum-web/package.json
@@ -22,7 +22,7 @@
   "github-markdown-css": "5.6.1",
   "jshint": "2.13.6",
   "jsonpath": "1.1.1",
-  "keycloak-js": "25.0.2",
+  "keycloak-js": "23.0.7",
   "luxon": "3.3.0",
   "moment": "2.30.1",
   "monaco-editor": "0.52.0",

diff --git a/infra/horreum-dev-services/runtime/pom.xml b/infra/horreum-dev-services/runtime/pom.xml
@@ -17,7 +17,7 @@
 
     <dependency>
       <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-keycloak-admin-client</artifactId>
+      <artifactId>quarkus-keycloak-admin-resteasy-client</artifactId>
     </dependency>
   </dependencies>
   <build>

diff --git a/infra/horreum-infra-common/pom.xml b/infra/horreum-infra-common/pom.xml
@@ -39,7 +39,6 @@
         <dependency>
             <groupId>org.keycloak</groupId>
             <artifactId>keycloak-admin-client</artifactId>
-            <version>${keycloak.version}</version>
         </dependency>
 
         <dependency>

diff --git a/...-infra-common/src/main/java/io/hyperfoil/tools/horreum/infra/common/HorreumResources.java b/...-infra-common/src/main/java/io/hyperfoil/tools/horreum/infra/common/HorreumResources.java
@@ -160,6 +160,7 @@ public static Map<String, String> startContainers(Map<String, String> initArgs)
                         keycloak.realm(HORREUM_REALM).clients().get(mainClient.getId()).getSecret().getValue());
             } catch (Exception e) {
                 log.error("Unable to re-configure keycloak instance: ".concat(e.getLocalizedMessage()));
+                throw new RuntimeException("Unable to re-configure keycloak instance: ".concat(e.getLocalizedMessage()));
             }
         }
 

diff --git a/pom.xml b/pom.xml
@@ -94,7 +94,7 @@
         <module.skipCopyDependencies>false</module.skipCopyDependencies>
 
         <!--  dev services configuration -->
-        <keycloak.version>25.0.2</keycloak.version>
+        <keycloak.version>23.0.7</keycloak.version>
         <dev.images.postgres>postgres:16</dev.images.postgres>
         <dev.images.keycloak>quay.io/keycloak/keycloak:${keycloak.version}</dev.images.keycloak>
         <dev.images.horreum>quay.io/hyperfoil/horreum:${project.version}</dev.images.horreum>
@@ -199,6 +199,43 @@
                 <artifactId>json-path</artifactId>
                 <version>${jayway.jsonpath.version}</version>
             </dependency>
+
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-keycloak-admin-resteasy-client</artifactId>
+                <version>${quarkus.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.keycloak</groupId>
+                        <artifactId>keycloak-admin-client</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.keycloak</groupId>
+                        <artifactId>keycloak-core</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.keycloak</groupId>
+                        <artifactId>keycloak-common</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+
+            <!-- Force keycloak admin client version -->
+            <dependency>
+                <groupId>org.keycloak</groupId>
+                <artifactId>keycloak-admin-client</artifactId>
+                <version>${keycloak.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.keycloak</groupId>
+                <artifactId>keycloak-core</artifactId>
+                <version>${keycloak.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.keycloak</groupId>
+                <artifactId>keycloak-common</artifactId>
+                <version>${keycloak.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>