mirror of
https://github.com/keycloak/keycloak.git
synced 2025-12-16 20:15:46 -06:00
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>
This commit is contained in:
4
pom.xml
4
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-->
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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 -> {
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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 {
|
||||
|
||||
Reference in New Issue
Block a user