Update keycloak to 26.0.5. Remove the extra braket in pom.xml. For id…

…entity providers added condition how to obtain them.

.env

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

.github/workflows/ci.yaml

@@ -44,7 +44,7 @@ jobs:
             KEYCLOAK_CLIENT_VERSION: 24.0.5
           - KEYCLOAK_VERSION: 25.0.1
             KEYCLOAK_CLIENT_VERSION: 25.0.1
-          - KEYCLOAK_VERSION: 26.0.4
+          - KEYCLOAK_VERSION: 26.0.5
             KEYCLOAK_CLIENT_VERSION: 26.0.2
     steps:
       - uses: actions/[email protected]

CHANGELOG.md

@@ -8,7 +8,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 ### Fixed
 - Fix  versioning in artifact to contain the correct keycloak version [#1097](https://github.com/adorsys/keycloak-config-cli/issues/1097)
 
-- Updated CI to use Keycloak 26.0.4
+- Updated CI to use Keycloak 26.0.5
 
 ### Fixed
 

Dockerfile

@@ -6,7 +6,7 @@ FROM ${BUILDER_IMAGE} AS BUILDER
 
 WORKDIR /app/
 
-ARG KEYCLOAK_VERSION=26.0.4
+ARG KEYCLOAK_VERSION=26.0.5
 ARG KEYCLOAK_CLIENT_VERSION=26.0.2
 ARG MAVEN_CLI_OPTS="-ntp -B"
 

pom.xml

@@ -59,7 +59,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
-        <keycloak.version>${keycloak.version}}</keycloak.version>
+        <keycloak.version>${keycloak.version}</keycloak.version>
         <!-- According to a new policy of the keycloak libraries releases: https://www.keycloak.org/2024/10/release-updates.html -->
         <keycloak.client.version>${keycloak.client.version}</keycloak.client.version>
 
@@ -1043,7 +1043,7 @@ import org.keycloak.representations.userprofile.config.UPConfig;</token>
                 </property>
             </activation>
             <properties>
-                <keycloak.version>26.0.4</keycloak.version>
+                <keycloak.version>26.0.5</keycloak.version>
                 <keycloak.client.version>26.0.2</keycloak.client.version>
             </properties>
         </profile>

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

@@ -53,7 +53,7 @@ class ImportIdentityProvidersIT extends AbstractImportIT {
     }
 
     private List<IdentityProviderRepresentation> getIdentityProviders(RealmRepresentation realm) {
-        return identityProviderRepository.getAll(realm.getRealm());
+        return VersionUtil.lt(KEYCLOAK_VERSION, "26") ? realm.getIdentityProviders() : identityProviderRepository.getAll(realm.getRealm());
     }
 
     @Test

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

@@ -23,6 +23,7 @@
 import de.adorsys.keycloak.config.AbstractImportIT;
 import de.adorsys.keycloak.config.repository.IdentityProviderMapperRepository;
 import de.adorsys.keycloak.config.repository.IdentityProviderRepository;
+import de.adorsys.keycloak.config.util.VersionUtil;
 import org.junit.jupiter.api.Order;
 import org.junit.jupiter.api.Test;
 import org.keycloak.representations.idm.*;
@@ -133,7 +134,11 @@ private void assertRealm() {
 
         List<ComponentExportRepresentation> createdSubComponents = createdComponents.get(0)
                 .getSubComponents().getList("org.keycloak.storage.ldap.mappers.LDAPStorageMapper");
-        assertThat(createdSubComponents, hasSize(11));
+        if (VersionUtil.lt(KEYCLOAK_VERSION, "26")) {
+            assertThat(createdSubComponents, hasSize(10));
+        } else {
+            assertThat(createdSubComponents, hasSize(11));
+        }
 
         List<String> authenticationFlowsList = Arrays.asList("my auth flow", "my registration", "my registration form");
         List<AuthenticationFlowRepresentation> createdAuthenticationFlows = createdRealm.getAuthenticationFlows()