diff --git a/model/infinispan/src/main/java/org/keycloak/connections/infinispan/RemoteCacheProvider.java b/model/infinispan/src/main/java/org/keycloak/connections/infinispan/RemoteCacheProvider.java index 1fa81d49747b..946dfcd7a2ca 100644 --- a/model/infinispan/src/main/java/org/keycloak/connections/infinispan/RemoteCacheProvider.java +++ b/model/infinispan/src/main/java/org/keycloak/connections/infinispan/RemoteCacheProvider.java @@ -34,6 +34,7 @@ import org.infinispan.client.hotrod.RemoteCacheManager; import org.infinispan.client.hotrod.configuration.Configuration; import org.infinispan.client.hotrod.configuration.ConfigurationBuilder; +import org.infinispan.commons.configuration.Combine; import org.infinispan.manager.EmbeddedCacheManager; import org.jboss.logging.Logger; import org.keycloak.Config; @@ -138,7 +139,7 @@ protected RemoteCacheManager getOrCreateSecuredRemoteCacheManager(Config.Scope c Configuration origConfig = origManager.getConfiguration(); ConfigurationBuilder cfgBuilder = new ConfigurationBuilder() - .read(origConfig); + .read(origConfig, Combine.DEFAULT); String securedHotRodEndpoint = origConfig.servers().stream() .map(serverConfiguration -> serverConfiguration.host() + ":" + serverConfiguration.port()) diff --git a/pom.xml b/pom.xml index 21f49a849d6d..32684d9b4a47 100644 --- a/pom.xml +++ b/pom.xml @@ -76,7 +76,7 @@ 2.2.220 6.2.7.Final 6.2.7.Final - 14.0.13.Final + 14.0.14.Final 4.6.2.Final