diff --git a/horreum-backend/pom.xml b/horreum-backend/pom.xml
index a5ae91e62..4ebd06327 100644
--- a/horreum-backend/pom.xml
+++ b/horreum-backend/pom.xml
@@ -150,6 +150,20 @@
io.quarkus
quarkus-keycloak-admin-resteasy-client
+
+
+ org.keycloak
+ keycloak-admin-client
+
+
+ org.keycloak
+ keycloak-core
+
+
+ org.keycloak
+ keycloak-common
+
+
io.quarkus
quarkus-elasticsearch-rest-client
@@ -164,10 +178,6 @@
commons-math3
${commons.math3.version}
-
- org.keycloak
- keycloak-admin-client
-
org.testcontainers
postgresql
diff --git a/horreum-integration-tests/pom.xml b/horreum-integration-tests/pom.xml
index e776bdcb2..5f42b4dce 100644
--- a/horreum-integration-tests/pom.xml
+++ b/horreum-integration-tests/pom.xml
@@ -33,12 +33,18 @@
io.hyperfoil.tools
horreum-backend
-
-
- io.quarkus
- quarkus-keycloak-admin-client
-
-
+
+
+ org.keycloak
+ keycloak-admin-client
+
+
+ org.keycloak
+ keycloak-core
+
+
+ org.keycloak
+ keycloak-common
io.hyperfoil.tools
diff --git a/horreum-web/package-lock.json b/horreum-web/package-lock.json
index 24a3f2e23..e90d8c1e5 100644
--- a/horreum-web/package-lock.json
+++ b/horreum-web/package-lock.json
@@ -26,7 +26,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.47.0",
@@ -1782,6 +1782,25 @@
"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
"integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="
},
+ "node_modules/base64-js": {
+ "version": "1.5.1",
+ "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
+ "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
+ "funding": [
+ {
+ "type": "github",
+ "url": "https://github.com/sponsors/feross"
+ },
+ {
+ "type": "patreon",
+ "url": "https://www.patreon.com/feross"
+ },
+ {
+ "type": "consulting",
+ "url": "https://feross.org/support"
+ }
+ ]
+ },
"node_modules/brace-expansion": {
"version": "1.1.11",
"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
@@ -3110,9 +3129,9 @@
"dev": true
},
"node_modules/js-sha256": {
- "version": "0.11.0",
- "resolved": "https://registry.npmjs.org/js-sha256/-/js-sha256-0.11.0.tgz",
- "integrity": "sha512-6xNlKayMZvds9h1Y1VWc0fQHQ82BxTXizWPEtEeGvmOUYpBRy4gbWroHLpzowe6xiQhHpelCQiE7HEdznyBL9Q=="
+ "version": "0.10.1",
+ "resolved": "https://registry.npmjs.org/js-sha256/-/js-sha256-0.10.1.tgz",
+ "integrity": "sha512-5obBtsz9301ULlsgggLg542s/jqtddfOpV5KJc4hajc9JV8GeY2gZHSVpYBn4nWqAUTJ9v+xwtbJ1mIBgIH5Vw=="
},
"node_modules/js-tokens": {
"version": "4.0.0",
@@ -3229,11 +3248,12 @@
}
},
"node_modules/keycloak-js": {
- "version": "25.0.2",
- "resolved": "https://registry.npmjs.org/keycloak-js/-/keycloak-js-25.0.2.tgz",
- "integrity": "sha512-ACLf5O5PqzfDJwGqvLpqM0kflYWmyl3+T7M2C23gztJYccDxdfNP54+B9OkXz2GnDpLUId0ceoA+lbHw9t4Wng==",
+ "version": "23.0.7",
+ "resolved": "https://registry.npmjs.org/keycloak-js/-/keycloak-js-23.0.7.tgz",
+ "integrity": "sha512-OmszsKzBhhm5yP4W1q/tMd+nNnKpOAdeVYcoGhphlv8Fj1bNk4wRTYzp7pn5BkvueLz7fhvKHz7uOc33524YrA==",
"dependencies": {
- "js-sha256": "^0.11.0",
+ "base64-js": "^1.5.1",
+ "js-sha256": "^0.10.1",
"jwt-decode": "^4.0.0"
}
},
diff --git a/horreum-web/package.json b/horreum-web/package.json
index b928c57c2..fc1084c88 100644
--- 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.47.0",
diff --git a/infra/horreum-dev-services/runtime/pom.xml b/infra/horreum-dev-services/runtime/pom.xml
index c52eb7369..20610c0dd 100644
--- a/infra/horreum-dev-services/runtime/pom.xml
+++ b/infra/horreum-dev-services/runtime/pom.xml
@@ -17,7 +17,7 @@
io.quarkus
- quarkus-keycloak-admin-client
+ quarkus-keycloak-admin-resteasy-client
diff --git a/infra/horreum-infra-common/pom.xml b/infra/horreum-infra-common/pom.xml
index 84bfd9294..ca19a525a 100644
--- a/infra/horreum-infra-common/pom.xml
+++ b/infra/horreum-infra-common/pom.xml
@@ -38,7 +38,6 @@
org.keycloak
keycloak-admin-client
- ${keycloak.version}
diff --git a/infra/horreum-infra-common/src/main/java/io/hyperfoil/tools/horreum/infra/common/HorreumResources.java b/infra/horreum-infra-common/src/main/java/io/hyperfoil/tools/horreum/infra/common/HorreumResources.java
index 5c0820449..a2c86fa86 100644
--- a/infra/horreum-infra-common/src/main/java/io/hyperfoil/tools/horreum/infra/common/HorreumResources.java
+++ b/infra/horreum-infra-common/src/main/java/io/hyperfoil/tools/horreum/infra/common/HorreumResources.java
@@ -160,6 +160,7 @@ public static Map startContainers(Map 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
index 4cf9d8f48..bfa4958e1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -94,7 +94,7 @@
false
- 25.0.2
+ 23.0.7
postgres:16
quay.io/keycloak/keycloak:${keycloak.version}
quay.io/hyperfoil/horreum:${project.version}
@@ -199,6 +199,43 @@
json-path
${jayway.jsonpath.version}
+
+
+ io.quarkus
+ quarkus-keycloak-admin-resteasy-client
+ ${quarkus.version}
+
+
+ org.keycloak
+ keycloak-admin-client
+
+
+ org.keycloak
+ keycloak-core
+
+
+ org.keycloak
+ keycloak-common
+
+
+
+
+
+
+ org.keycloak
+ keycloak-admin-client
+ ${keycloak.version}
+
+
+ org.keycloak
+ keycloak-core
+ ${keycloak.version}
+
+
+ org.keycloak
+ keycloak-common
+ ${keycloak.version}
+