feat: Adds support for Keycloak 26.1

.env

@@ -1,3 +1,3 @@
 # Used in docker-compose
 # shellcheck disable=SC2034
-KEYCLOAK_VERSION=26.0.5
+KEYCLOAK_VERSION=26.1.0

.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:

CHANGELOG.md

@@ -15,6 +15,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ### 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)

Dockerfile

@@ -2,12 +2,12 @@
 ARG BUILDER_IMAGE=eclipse-temurin:21-jdk
 ARG RUNTIME_IMAGE=eclipse-temurin:21-jre
 
 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
@@ -29,7 +29,7 @@
 ENV JAVA_OPTS="" KEYCLOAK_SSL_VERIFY=true IMPORT_FILES_LOCATIONS=file:/config/*
 
 # $0 represents the first CLI arg which is not inside $@
 ENTRYPOINT exec java $JAVA_OPTS -jar /app/keycloak-config-cli.jar $0 $@
 
 COPY --from=BUILDER /app/target/keycloak-config-cli.jar /app/keycloak-config-cli.jar
 

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 -->

src/test/java/de/adorsys/keycloak/config/service/ImportAuthenticationFlowsIT.java

@@ -761,11 +761,15 @@ void shouldUpdateMultipleExecutionsWithSameAuthenticator() throws IOException {
 
         List<AuthenticatorConfigRepresentation> authConfig;
         authConfig = getAuthenticatorConfig(realm, "id1");
-        assertThat(authConfig, hasSize(2));
+        int expectedAuthConfigSize = VersionUtil.lt(KEYCLOAK_VERSION, "26.1")? 2 : 1;
+
+        assertThat(authConfig, hasSize(expectedAuthConfigSize));
         assertThat(authConfig.get(0).getAlias(), is("id1"));
         assertThat(authConfig.get(0).getConfig(), hasEntry(is("defaultProvider"), is("id1")));
-        assertThat(authConfig.get(1).getAlias(), is("id1"));
-        assertThat(authConfig.get(1).getConfig(), hasEntry(is("defaultProvider"), is("id1")));
+        if (VersionUtil.lt(KEYCLOAK_VERSION, "26.1")) {
+            assertThat(authConfig.get(1).getAlias(), is("id1"));
+            assertThat(authConfig.get(1).getConfig(), hasEntry(is("defaultProvider"), is("id1")));
+        }
 
         authConfig = getAuthenticatorConfig(realm, "id2");
         assertThat(authConfig, hasSize(1));
@@ -792,11 +796,15 @@ void shouldUpdateMultipleExecutionsWithSameAuthenticatorWithConfig() throws IOEx
 
         List<AuthenticatorConfigRepresentation> authConfig;
         authConfig = getAuthenticatorConfig(realm, "id1");
-        assertThat(authConfig, hasSize(2));
+        int expectedAuthConfigSize = VersionUtil.lt(KEYCLOAK_VERSION, "26.1")? 2 : 1;
+
+        assertThat(authConfig, hasSize(expectedAuthConfigSize));
         assertThat(authConfig.get(0).getAlias(), is("id1"));
         assertThat(authConfig.get(0).getConfig(), hasEntry(is("defaultProvider"), is("id2")));
-        assertThat(authConfig.get(1).getAlias(), is("id1"));
-        assertThat(authConfig.get(1).getConfig(), hasEntry(is("defaultProvider"), is("id2")));
+        if (VersionUtil.lt(KEYCLOAK_VERSION, "26.1")) {
+            assertThat(authConfig.get(1).getAlias(), is("id1"));
+            assertThat(authConfig.get(1).getConfig(), hasEntry(is("defaultProvider"), is("id2")));
+        }
 
         authConfig = getAuthenticatorConfig(realm, "id2");
         assertThat(authConfig, hasSize(1));

src/test/java/de/adorsys/keycloak/config/service/ImportClientsIT.java

@@ -2003,9 +2003,13 @@ void shouldRemoveAuthzPoliciesForRealmManagement() throws IOException {
         assertThat(client.getAuthenticationFlowBindingOverrides(), anEmptyMap());
         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 {