From cbb2f84d58f37545981a3e2bf4fa9868ca3d52c7 Mon Sep 17 00:00:00 2001
From: Ryan Emerson <remerson@ibm.com>
Date: Mon, 24 Nov 2025 11:43:39 +0000
Subject: [PATCH] Upgrade to Infinispan 16.0.2

- Remove use of deprecated
  org.infinispan.server.test.core.InfinispanContainer class
- Use org.infinispan.testcontainers.CountdownLatchLoggingConsumer
- Use testcontainers-infinispan dependency

Signed-off-by: Ryan Emerson <remerson@ibm.com>
---
 pom.xml                                       |  4 ++--
 quarkus/tests/junit5/pom.xml                  |  3 +--
 .../junit5/extension/InfinispanContainer.java | 20 ++++++++++++-------
 .../server/ClusteredKeycloakServer.java       |  2 +-
 .../infinispan/InfinispanExternalServer.java  |  2 +-
 5 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/pom.xml b/pom.xml
index 2825a8a8532..1fba0d97e89 100644
--- a/pom.xml
+++ b/pom.xml
@@ -92,8 +92,8 @@
         <hibernate-orm.plugin.version>6.2.13.Final</hibernate-orm.plugin.version>
         <hibernate.c3p0.version>6.2.13.Final</hibernate.c3p0.version>
         <hibernate-validator.version>9.0.1.Final</hibernate-validator.version>
-        <infinispan.version>16.0.1</infinispan.version>
-        <protostream.version>6.0.1</protostream.version> <!-- For the annotation processor: keep in sync with the version shipped with Infinispan -->
+        <infinispan.version>16.0.2</infinispan.version>
+        <protostream.version>6.0.2</protostream.version> <!-- For the annotation processor: keep in sync with the version shipped with Infinispan -->
         <protostream.plugin.version>${protostream.version}</protostream.plugin.version>
 
         <!--JAKARTA-->
diff --git a/quarkus/tests/junit5/pom.xml b/quarkus/tests/junit5/pom.xml
index 4f702145ac3..fd0f8615090 100644
--- a/quarkus/tests/junit5/pom.xml
+++ b/quarkus/tests/junit5/pom.xml
@@ -57,9 +57,8 @@
         </dependency>
         <dependency>
             <groupId>org.infinispan</groupId>
-            <artifactId>infinispan-server-testdriver-core</artifactId>
+            <artifactId>testcontainers-infinispan</artifactId>
         </dependency>
-
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
diff --git a/quarkus/tests/junit5/src/main/java/org/keycloak/it/junit5/extension/InfinispanContainer.java b/quarkus/tests/junit5/src/main/java/org/keycloak/it/junit5/extension/InfinispanContainer.java
index 75f0c4546e9..24a0c1b9b47 100644
--- a/quarkus/tests/junit5/src/main/java/org/keycloak/it/junit5/extension/InfinispanContainer.java
+++ b/quarkus/tests/junit5/src/main/java/org/keycloak/it/junit5/extension/InfinispanContainer.java
@@ -23,11 +23,12 @@ import org.keycloak.connections.infinispan.InfinispanConnectionProvider;
 
 import com.github.dockerjava.api.command.InspectContainerResponse;
 import org.infinispan.client.hotrod.RemoteCacheManager;
+import org.infinispan.client.hotrod.configuration.ConfigurationBuilder;
 import org.infinispan.commons.configuration.StringConfiguration;
 import org.jboss.logging.Logger;
 import org.testcontainers.images.PullPolicy;
 
-public class InfinispanContainer extends org.infinispan.server.test.core.InfinispanContainer {
+public class InfinispanContainer extends org.infinispan.testcontainers.InfinispanContainer {
 
     private final Logger LOG = Logger.getLogger(getClass());
     public static final String PORT = System.getProperty("keycloak.externalInfinispan.port", "11222");
@@ -51,7 +52,6 @@ public class InfinispanContainer extends org.infinispan.server.test.core.Infinis
         if (getImageName().startsWith("quay.io/infinispan-test")) {
             withImagePullPolicy(PullPolicy.alwaysPull());
         }
-
     }
 
     private static String getImageName() {
@@ -73,17 +73,23 @@ public class InfinispanContainer extends org.infinispan.server.test.core.Infinis
         remoteCacheManager.administration().removeCache(cache);
     }
 
-    private void establishHotRodConnection() {
-        remoteCacheManager = getRemoteCacheManager();
-    }
-
     @Override
     public void start() {
         logger().info("Starting ISPN container");
 
         super.start();
 
-        establishHotRodConnection();
+        remoteCacheManager = new RemoteCacheManager(
+              new ConfigurationBuilder()
+                    .addServer()
+                    .host(getHost())
+                    .port(getMappedPort(DEFAULT_HOTROD_PORT))
+                    .security()
+                    .authentication()
+                    .username(getEnvMap().get(USER))
+                    .password(getEnvMap().get(PASS))
+                    .build()
+        );
 
         Arrays.stream(InfinispanConnectionProvider.CLUSTERED_CACHE_NAMES)
                 .forEach(cacheName -> {
diff --git a/test-framework/clustering/src/main/java/org/keycloak/testframework/server/ClusteredKeycloakServer.java b/test-framework/clustering/src/main/java/org/keycloak/testframework/server/ClusteredKeycloakServer.java
index 68b08c7c5cf..b3468b1de35 100644
--- a/test-framework/clustering/src/main/java/org/keycloak/testframework/server/ClusteredKeycloakServer.java
+++ b/test-framework/clustering/src/main/java/org/keycloak/testframework/server/ClusteredKeycloakServer.java
@@ -27,7 +27,7 @@ import org.keycloak.testframework.clustering.LoadBalancer;
 import org.keycloak.testframework.infinispan.CacheType;
 import org.keycloak.testframework.logging.JBossLogConsumer;
 
-import org.infinispan.server.test.core.CountdownLatchLoggingConsumer;
+import org.infinispan.testcontainers.CountdownLatchLoggingConsumer;
 import org.jboss.logging.Logger;
 import org.testcontainers.images.RemoteDockerImage;
 import org.testcontainers.utility.DockerImageName;
diff --git a/test-framework/core/src/main/java/org/keycloak/testframework/infinispan/InfinispanExternalServer.java b/test-framework/core/src/main/java/org/keycloak/testframework/infinispan/InfinispanExternalServer.java
index b21b5142b59..f37ff898b27 100644
--- a/test-framework/core/src/main/java/org/keycloak/testframework/infinispan/InfinispanExternalServer.java
+++ b/test-framework/core/src/main/java/org/keycloak/testframework/infinispan/InfinispanExternalServer.java
@@ -5,7 +5,7 @@ import java.util.Map;
 import org.keycloak.testframework.logging.JBossLogConsumer;
 import org.keycloak.testframework.util.ContainerImages;
 
-import org.infinispan.server.test.core.InfinispanContainer;
+import org.infinispan.testcontainers.InfinispanContainer;
 import org.jboss.logging.Logger;
 
 public class InfinispanExternalServer extends InfinispanContainer implements InfinispanServer {