diff --git a/.env b/.env
index 089480c4f..4da386881 100644
--- a/.env
+++ b/.env
@@ -1,3 +1,3 @@
# Used in docker-compose
# shellcheck disable=SC2034
-KEYCLOAK_VERSION=26.0.4
+KEYCLOAK_VERSION=26.0.5
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index af9c0552f..666204219 100644
--- a/.github/workflows/ci.yaml
+++ b/.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/checkout@v4.2.1
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4c02edb2e..a532bf3ee 100644
--- a/CHANGELOG.md
+++ b/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
diff --git a/Dockerfile b/Dockerfile
index 67206257a..4bd93721c 100644
--- a/Dockerfile
+++ b/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"
diff --git a/pom.xml b/pom.xml
index af94317bc..53261031a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -59,7 +59,7 @@
UTF-8
UTF-8
- ${keycloak.version}}
+ ${keycloak.version}
${keycloak.client.version}
@@ -1043,7 +1043,7 @@ import org.keycloak.representations.userprofile.config.UPConfig;
- 26.0.4
+ 26.0.5
26.0.2
diff --git a/src/test/java/de/adorsys/keycloak/config/service/ImportIdentityProvidersIT.java b/src/test/java/de/adorsys/keycloak/config/service/ImportIdentityProvidersIT.java
index 71e52f0e3..64d585ce4 100644
--- a/src/test/java/de/adorsys/keycloak/config/service/ImportIdentityProvidersIT.java
+++ b/src/test/java/de/adorsys/keycloak/config/service/ImportIdentityProvidersIT.java
@@ -53,7 +53,7 @@ class ImportIdentityProvidersIT extends AbstractImportIT {
}
private List getIdentityProviders(RealmRepresentation realm) {
- return identityProviderRepository.getAll(realm.getRealm());
+ return VersionUtil.lt(KEYCLOAK_VERSION, "26") ? realm.getIdentityProviders() : identityProviderRepository.getAll(realm.getRealm());
}
@Test
diff --git a/src/test/java/de/adorsys/keycloak/config/service/ImportManagedNoDeleteIT.java b/src/test/java/de/adorsys/keycloak/config/service/ImportManagedNoDeleteIT.java
index 141d983fd..d05f59528 100644
--- a/src/test/java/de/adorsys/keycloak/config/service/ImportManagedNoDeleteIT.java
+++ b/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 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 authenticationFlowsList = Arrays.asList("my auth flow", "my registration", "my registration form");
List createdAuthenticationFlows = createdRealm.getAuthenticationFlows()