From 1b8a3fa54862727850370ff5719adb26e2fa690e Mon Sep 17 00:00:00 2001
From: Kacper Magdziarz <95610011+kmagdziarz@users.noreply.github.com>
Date: Mon, 10 Feb 2025 12:32:04 +0100
Subject: [PATCH] [ACS-9181] Bump Keycloak to 26.1.0 on ACS 7.3.N (#3176)

---
 .../IdentityServiceRemoteUserMapperTest.java           |  2 +-
 .../src/test/resources/alfresco-global.properties      |  2 +-
 scripts/ci/docker-compose/docker-compose.yaml          | 10 +++++-----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/repository/src/test/java/org/alfresco/repo/security/authentication/identityservice/IdentityServiceRemoteUserMapperTest.java b/repository/src/test/java/org/alfresco/repo/security/authentication/identityservice/IdentityServiceRemoteUserMapperTest.java
index 054414530e..7d1ec42b6a 100644
--- a/repository/src/test/java/org/alfresco/repo/security/authentication/identityservice/IdentityServiceRemoteUserMapperTest.java
+++ b/repository/src/test/java/org/alfresco/repo/security/authentication/identityservice/IdentityServiceRemoteUserMapperTest.java
@@ -200,7 +200,7 @@ public class IdentityServiceRemoteUserMapperTest extends AbstractChainedSubsyste
         assertEquals("identity-service.client-connection-timeout", 3000,
                 this.identityServiceConfig.getClientConnectionTimeout());
 
-        assertEquals("identity-service.client-socket-timeout", 1000,
+        assertEquals("identity-service.client-socket-timeout", 3000,
                 this.identityServiceConfig.getClientSocketTimeout());
 
         // check boolean overrides
diff --git a/repository/src/test/resources/alfresco-global.properties b/repository/src/test/resources/alfresco-global.properties
index 4e9836dd2d..4ce7db18d3 100644
--- a/repository/src/test/resources/alfresco-global.properties
+++ b/repository/src/test/resources/alfresco-global.properties
@@ -43,7 +43,7 @@ identity-service.enable-pkce=true
 identity-service.ignore-oauth-query-parameter=true
 identity-service.credentials.secret=11111
 identity-service.credentials.provider=secret
-identity-service.client-socket-timeout=1000
+identity-service.client-socket-timeout=3000
 identity-service.client-connection-timeout=3000
 identity-service.authentication.enable-username-password-authentication=false
 
diff --git a/scripts/ci/docker-compose/docker-compose.yaml b/scripts/ci/docker-compose/docker-compose.yaml
index 4479d15347..7b3c01d12b 100644
--- a/scripts/ci/docker-compose/docker-compose.yaml
+++ b/scripts/ci/docker-compose/docker-compose.yaml
@@ -26,13 +26,13 @@ services:
       - "61616:61616" # OpenWire
   keycloak:
     profiles: ["with-sso"]
-    image: quay.io/keycloak/keycloak:25.0.6
+    image: quay.io/keycloak/keycloak:26.1.0
     environment:
-      - KEYCLOAK_ADMIN=admin
-      - KEYCLOAK_ADMIN_PASSWORD=admin
-      - KC_DB=dev-mem
+      - KC_BOOTSTRAP_ADMIN_USERNAME=admin
+      - KC_BOOTSTRAP_ADMIN_PASSWORD=admin
+      - KC_DB=dev-file
     command: ["start-dev", "--import-realm", "--http-relative-path=/auth", "--hostname=localhost", "--http-enabled=true"]
     volumes:
       - ../../../repository/src/test/resources/realms/alfresco-realm.json:/opt/keycloak/data/import/alfresco-realm.json
     ports:
-      - 8999:8080
\ No newline at end of file
+      - 8999:8080