feat: Adds support for Keycloak 26.1

adorsys · Jan 27, 2025 · c877a80 · c877a80
1 parent ae5dbe7
commit c877a80
Show file tree

Hide file tree

Showing 7 changed files with 1,953 additions and 7 deletions.
diff --git a/.env b/.env
@@ -1,3 +1,3 @@
 # Used in docker-compose
 # shellcheck disable=SC2034
-KEYCLOAK_VERSION=26.0.5
+KEYCLOAK_VERSION=26.1.0
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -47,6 +47,8 @@ jobs:
             KEYCLOAK_CLIENT_VERSION: 25.0.1
           - KEYCLOAK_VERSION: 26.0.5
             KEYCLOAK_CLIENT_VERSION: 26.0.2
+          - KEYCLOAK_VERSION: 26.1.0
+            KEYCLOAK_CLIENT_VERSION: 26.0.4
     steps:
       - uses: actions/[email protected]
         with:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 -  Fix Service Account User always triggers UPDATE USER event [#878](https://github.com/adorsys/keycloak-config-cli/issues/878)
 ### Added
 - Publish charts with github pages [#941](https://github.com/adorsys/keycloak-config-cli/issues/941)
+- Support for Keycloak 26.1
 
 ### Fixed
 -  Fix Initial Credentials Causes Update [819](https://github.com/adorsys/keycloak-config-cli/issues/819)

diff --git a/Dockerfile b/Dockerfile
@@ -6,8 +6,8 @@ FROM ${BUILDER_IMAGE} AS BUILDER
 
 WORKDIR /app/
 
-ARG KEYCLOAK_VERSION=26.0.5
-ARG KEYCLOAK_CLIENT_VERSION=26.0.2
+ARG KEYCLOAK_VERSION=26.1.0
+ARG KEYCLOAK_CLIENT_VERSION=26.0.4
 ARG MAVEN_CLI_OPTS="-ntp -B"
 
 COPY .mvn .mvn

diff --git a/pom.xml b/pom.xml
@@ -1043,8 +1043,8 @@ import org.keycloak.representations.userprofile.config.UPConfig;</token>
                 </property>
             </activation>
             <properties>
-                <keycloak.version>26.0.5</keycloak.version>
-                <keycloak.client.version>26.0.2</keycloak.client.version>
+                <keycloak.version>26.1.0</keycloak.version>
+                <keycloak.client.version>26.0.4</keycloak.client.version>
             </properties>
         </profile>
         <!-- Configure the JBoss GA Maven repository -->

diff --git a/src/test/java/de/adorsys/keycloak/config/service/ImportClientsIT.java b/src/test/java/de/adorsys/keycloak/config/service/ImportClientsIT.java
@@ -1992,8 +1992,11 @@ void shouldRemoveAuthzPoliciesForRealmManagement() throws IOException {
         assertThat(client.isFullScopeAllowed(), is(false));
         assertThat(client.getNodeReRegistrationTimeout(), is(0));
         assertThat(client.getDefaultClientScopes(), containsInAnyOrder("web-origins", "profile", "roles", "email"));
-        assertThat(client.getOptionalClientScopes(), containsInAnyOrder("address", "phone", "offline_access", "microprofile-jwt"));
-
+        if (VersionUtil.lt(KEYCLOAK_VERSION, "26.1")) {
+            assertThat(client.getDefaultClientScopes(), containsInAnyOrder("web-origins", "profile", "roles", "email"));
+        } else {
+            assertThat(client.getDefaultClientScopes(), containsInAnyOrder("web-origins", "profile", "roles", "email", "service_account"));
+        }
         if (VersionUtil.lt(KEYCLOAK_VERSION, "26")) {
             assertThat(client.getAttributes(), hasKey("client.secret.creation.time"));
         } else {