From bcdfe0ba0403cffe10b8838301ab2bcd7b75f75e Mon Sep 17 00:00:00 2001
From: Pedro Ruivo <pruivo@users.noreply.github.com>
Date: Mon, 10 Feb 2025 17:48:08 +0000
Subject: [PATCH] Upgrade Infinispan to 15.0.12.Final

Closes #36686

Signed-off-by: Pedro Ruivo <pruivo@redhat.com>
---
 pom.xml                                       |  2 +-
 .../testsuite/model/HotRodServerRule.java     | 36 -------------------
 2 files changed, 1 insertion(+), 37 deletions(-)

diff --git a/pom.xml b/pom.xml
index 38c820476c..02c708366f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -96,7 +96,7 @@
         <h2.version>2.3.230</h2.version>
         <hibernate-orm.plugin.version>6.2.13.Final</hibernate-orm.plugin.version>
         <hibernate.c3p0.version>6.2.13.Final</hibernate.c3p0.version>
-        <infinispan.version>15.0.11.Final</infinispan.version>
+        <infinispan.version>15.0.12.Final</infinispan.version>
         <protostream.plugin.version>5.0.12.Final</protostream.plugin.version>
 
         <!--JAKARTA-->
diff --git a/testsuite/model/src/main/java/org/keycloak/testsuite/model/HotRodServerRule.java b/testsuite/model/src/main/java/org/keycloak/testsuite/model/HotRodServerRule.java
index 641aa34b77..277fbf9579 100644
--- a/testsuite/model/src/main/java/org/keycloak/testsuite/model/HotRodServerRule.java
+++ b/testsuite/model/src/main/java/org/keycloak/testsuite/model/HotRodServerRule.java
@@ -2,7 +2,6 @@ package org.keycloak.testsuite.model;
 
 import java.io.IOException;
 import java.util.List;
-import java.util.concurrent.ThreadLocalRandom;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Stream;
 
@@ -13,11 +12,6 @@ import org.infinispan.configuration.cache.BackupConfiguration;
 import org.infinispan.configuration.cache.BackupFailurePolicy;
 import org.infinispan.configuration.cache.CacheMode;
 import org.infinispan.configuration.cache.ConfigurationBuilder;
-import org.infinispan.container.versioning.IncrementableEntryVersion;
-import org.infinispan.container.versioning.NumericVersion;
-import org.infinispan.container.versioning.VersionGenerator;
-import org.infinispan.factories.ComponentRegistry;
-import org.infinispan.factories.KnownComponentNames;
 import org.infinispan.manager.DefaultCacheManager;
 import org.infinispan.server.hotrod.HotRodServer;
 import org.infinispan.server.hotrod.configuration.HotRodServerConfiguration;
@@ -89,42 +83,12 @@ public class HotRodServerRule extends ExternalResource {
 
         // create remote keycloak caches
         createKeycloakCaches(config.getBoolean("async", false) ? CacheMode.REPL_ASYNC : CacheMode.REPL_SYNC);
-        replaceVersionGenerator();
 
         // Use Keycloak time service in remote caches
         InfinispanUtil.setTimeServiceToKeycloakTime(hotRodCacheManager);
         InfinispanUtil.setTimeServiceToKeycloakTime(hotRodCacheManager2);
     }
 
-    // ----- WORKAROUND FOR https://github.com/infinispan/infinispan/issues/13191 -----//
-    private void replaceVersionGenerator() {
-        CACHES_NAME.stream()
-                .flatMap(name -> Stream.of(hotRodCacheManager.getCache(name), hotRodCacheManager2.getCache(name)))
-                .map(ComponentRegistry::of)
-                .forEach(cr -> cr.registerComponent(RANDOM_GENERATOR, KnownComponentNames.HOT_ROD_VERSION_GENERATOR, false));
-    }
-
-    private static final NumericVersion NON_EXISTING = new NumericVersion(0);
-    private static final VersionGenerator RANDOM_GENERATOR = new VersionGenerator() {
-        @Override
-        public IncrementableEntryVersion generateNew() {
-            var version = ThreadLocalRandom.current().nextLong();
-            return version == 0 ? new NumericVersion(1L) : new NumericVersion(version);
-        }
-
-        @Override
-        public IncrementableEntryVersion increment(IncrementableEntryVersion initialVersion) {
-            // not used by hot rod
-            throw new IllegalStateException();
-        }
-
-        @Override
-        public IncrementableEntryVersion nonExistingVersion() {
-            return NON_EXISTING;
-        }
-    };
-    // ----- END OF WORKAROUND -----//
-
     private void createKeycloakCaches(CacheMode cacheMode) {
         var builder = createCacheConfigurationBuilder();
         builder.clustering().cacheMode(cacheMode);