From dfc8c80264b03ebf85b5735103586cae616838ce Mon Sep 17 00:00:00 2001
From: Alexander Schwartz <aschwart@redhat.com>
Date: Wed, 16 Aug 2023 14:43:03 +0200
Subject: [PATCH] Upgrade to Infinispan 14.0.14 (#22386)

Closes #21092
---
 .../keycloak/connections/infinispan/RemoteCacheProvider.java   | 3 ++-
 pom.xml                                                        | 2 +-
 2 files changed, 3 insertions(+), 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
index 1fa81d4974..946dfcd7a2 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.RemoteCache;
 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 @@ public class RemoteCacheProvider {
         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 21f49a849d..32684d9b4a 100644
--- 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-->