Upgrade to Infinispan 14.0.14

Closes keycloak#21092 (cherry picked from commit dfc8c80)
ahus1 · Aug 16, 2023 · ff54baa · ff54baa
1 parent adec6c5
commit ff54baa
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
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
@@ -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
@@ -76,7 +76,7 @@
         <h2.version>2.2.220</h2.version>
         <hibernate-orm.plugin.version>6.2.7.Final</hibernate-orm.plugin.version>
         <hibernate.c3p0.version>6.2.7.Final</hibernate.c3p0.version>
-        <infinispan.version>14.0.13.Final</infinispan.version>
+        <infinispan.version>14.0.14.Final</infinispan.version>
         <infinispan.protostream.processor.version>4.6.2.Final</infinispan.protostream.processor.version>
 
         <!--JAKARTA-->