From 98a258dd887a3e3fbc2715727e4a0423f4277927 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 10 Jul 2025 21:14:05 +0000 Subject: [PATCH 1/3] Bump org.keycloak:keycloak-services in /conf/keycloak/builtin-users-spi Bumps [org.keycloak:keycloak-services](https://github.com/keycloak/keycloak) from 26.1.4 to 26.3.0. - [Release notes](https://github.com/keycloak/keycloak/releases) - [Commits](https://github.com/keycloak/keycloak/compare/26.1.4...26.3.0) --- updated-dependencies: - dependency-name: org.keycloak:keycloak-services dependency-version: 26.3.0 dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- conf/keycloak/builtin-users-spi/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/keycloak/builtin-users-spi/pom.xml b/conf/keycloak/builtin-users-spi/pom.xml index afb3495c2be..2690e13fa6d 100644 --- a/conf/keycloak/builtin-users-spi/pom.xml +++ b/conf/keycloak/builtin-users-spi/pom.xml @@ -100,7 +100,7 @@ - 26.1.4 + 26.3.0 17 3.2.0 0.4 From 8a95d1ee1dc215ea9b5b6082dd871cd9a016aa98 Mon Sep 17 00:00:00 2001 From: GPortas Date: Sat, 26 Jul 2025 06:09:19 +0100 Subject: [PATCH 2/3] Changed: upgraded keycloak version to 26.3.2 --- conf/keycloak/Dockerfile | 2 +- conf/keycloak/builtin-users-spi/pom.xml | 2 +- conf/keycloak/docker-compose.yml | 2 +- conf/keycloak/run-keycloak.sh | 2 +- docker-compose-dev.yml | 2 +- .../oauth2/oidc/OIDCAuthenticationProviderFactoryIT.java | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/conf/keycloak/Dockerfile b/conf/keycloak/Dockerfile index 76088f402c7..9da893d2a22 100644 --- a/conf/keycloak/Dockerfile +++ b/conf/keycloak/Dockerfile @@ -14,7 +14,7 @@ RUN mvn clean package # ------------------------------------------ # Stage 2: Build Keycloak Image # ------------------------------------------ -FROM quay.io/keycloak/keycloak:26.1.4 +FROM quay.io/keycloak/keycloak:26.3.2 # Add the Oracle JDBC jars ARG ORACLE_JDBC_VERSION=23.7.0.25.01 diff --git a/conf/keycloak/builtin-users-spi/pom.xml b/conf/keycloak/builtin-users-spi/pom.xml index 2690e13fa6d..36cf6548d01 100644 --- a/conf/keycloak/builtin-users-spi/pom.xml +++ b/conf/keycloak/builtin-users-spi/pom.xml @@ -100,7 +100,7 @@ - 26.3.0 + 26.3.2 17 3.2.0 0.4 diff --git a/conf/keycloak/docker-compose.yml b/conf/keycloak/docker-compose.yml index 272d8ace363..4b5cf80daca 100644 --- a/conf/keycloak/docker-compose.yml +++ b/conf/keycloak/docker-compose.yml @@ -3,7 +3,7 @@ version: "3.9" services: keycloak: - image: 'quay.io/keycloak/keycloak:26.1.4' + image: 'quay.io/keycloak/keycloak:26.3.2' command: - "start-dev" - "--import-realm" diff --git a/conf/keycloak/run-keycloak.sh b/conf/keycloak/run-keycloak.sh index 9f851a558c7..9ea34a99416 100755 --- a/conf/keycloak/run-keycloak.sh +++ b/conf/keycloak/run-keycloak.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -DOCKER_IMAGE="quay.io/keycloak/keycloak:26.1.4" +DOCKER_IMAGE="quay.io/keycloak/keycloak:26.3.2" KEYCLOAK_USER="kcadmin" KEYCLOAK_PASSWORD="kcpassword" KEYCLOAK_PORT=8090 diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml index 4a6d455d4de..5936f3dcdab 100644 --- a/docker-compose-dev.yml +++ b/docker-compose-dev.yml @@ -171,7 +171,7 @@ services: dev_keycloak: container_name: "dev_keycloak" - image: 'quay.io/keycloak/keycloak:26.1.4' + image: 'quay.io/keycloak/keycloak:26.3.2' hostname: keycloak environment: - KEYCLOAK_ADMIN=kcadmin diff --git a/src/test/java/edu/harvard/iq/dataverse/authorization/providers/oauth2/oidc/OIDCAuthenticationProviderFactoryIT.java b/src/test/java/edu/harvard/iq/dataverse/authorization/providers/oauth2/oidc/OIDCAuthenticationProviderFactoryIT.java index 3f2afb1927e..0ca74ab2f2b 100644 --- a/src/test/java/edu/harvard/iq/dataverse/authorization/providers/oauth2/oidc/OIDCAuthenticationProviderFactoryIT.java +++ b/src/test/java/edu/harvard/iq/dataverse/authorization/providers/oauth2/oidc/OIDCAuthenticationProviderFactoryIT.java @@ -66,7 +66,7 @@ class OIDCAuthenticationProviderFactoryIT { // The realm JSON resides in conf/keycloak/test-realm.json and gets avail here using in pom.xml @Container - static KeycloakContainer keycloakContainer = new KeycloakContainer("quay.io/keycloak/keycloak:26.1.4") + static KeycloakContainer keycloakContainer = new KeycloakContainer("quay.io/keycloak/keycloak:26.3.2") .withRealmImportFile("keycloak/test-realm.json") .withAdminUsername(adminUser) .withAdminPassword(adminPassword); From 6651d86d0c61195d8805a66cb8616713b16c756f Mon Sep 17 00:00:00 2001 From: GPortas Date: Mon, 28 Jul 2025 05:24:55 +0100 Subject: [PATCH 3/3] Changed: ORACLE_JDBC_VERSION version in Keycloak Dockerfile --- conf/keycloak/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/keycloak/Dockerfile b/conf/keycloak/Dockerfile index 9da893d2a22..6fbaad787b3 100644 --- a/conf/keycloak/Dockerfile +++ b/conf/keycloak/Dockerfile @@ -17,7 +17,7 @@ RUN mvn clean package FROM quay.io/keycloak/keycloak:26.3.2 # Add the Oracle JDBC jars -ARG ORACLE_JDBC_VERSION=23.7.0.25.01 +ARG ORACLE_JDBC_VERSION=23.8.0.25.04 ADD --chown=keycloak:keycloak https://repo1.maven.org/maven2/com/oracle/database/jdbc/ojdbc11/${ORACLE_JDBC_VERSION}/ojdbc11-${ORACLE_JDBC_VERSION}.jar /opt/keycloak/providers/ojdbc11.jar ADD --chown=keycloak:keycloak https://repo1.maven.org/maven2/com/oracle/database/nls/orai18n/${ORACLE_JDBC_VERSION}/orai18n-${ORACLE_JDBC_VERSION}.jar /opt/keycloak/providers/orai18n.jar