Update quarkus to 3.15.2

apache · Nov 28, 2024 · fdd9122 · fdd9122
1 parent 0063a09
commit fdd9122
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 13 deletions.
diff --git a/build-parent/pom.xml b/build-parent/pom.xml
@@ -74,7 +74,7 @@
     <version.guru.nidi>0.18.0</version.guru.nidi>
     <version.info.picocli>4.7.5</version.info.picocli>
     <version.io.micrometer>1.12.2</version.io.micrometer>
-    <version.io.quarkus>3.15.1</version.io.quarkus>
+    <version.io.quarkus>3.15.2</version.io.quarkus>
     <version.io.smallrye.openapi.core>3.10.0</version.io.smallrye.openapi.core>
     <version.it.unimi.dsi.fastutil>8.5.11</version.it.unimi.dsi.fastutil>
     <version.junit>4.13.1</version.junit>
@@ -99,7 +99,8 @@
     <!--This needs to be in sync with JUnit-->
     <version.org.hamcrest>2.2</version.org.hamcrest>
     <version.org.hsqldb>2.3.0</version.org.hsqldb>
-    <version.org.infinispan>14.0.25.Final</version.org.infinispan>
+    <version.org.infinispan>15.0.8.Final</version.org.infinispan>
+    <version.org.infinispan.protostream>5.0.8.Final</version.org.infinispan.protostream>
     <version.org.javassist>3.26.0-GA</version.org.javassist>
     <version.org.jboss.narayana.tomcat>7.0.2.Final</version.org.jboss.narayana.tomcat>
     <version.org.jboss.logging>3.5.3.Final</version.org.jboss.logging>
@@ -749,7 +750,32 @@
         <version>${version.org.javassist}</version>
       </dependency>
 
-
+      <!-- infinispan -->
+      <dependency>
+        <groupId>org.infinispan</groupId>
+        <artifactId>infinispan-core</artifactId>
+        <version>${version.org.infinispan}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.infinispan</groupId>
+        <artifactId>infinispan-client-hotrod</artifactId>
+        <version>${version.org.infinispan}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.infinispan</groupId>
+        <artifactId>infinispan-server-testdriver-core</artifactId>
+        <version>${version.org.infinispan}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.infinispan.protostream</groupId>
+        <artifactId>protostream</artifactId>
+        <version>${version.org.infinispan.protostream}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.infinispan.protostream</groupId>
+        <artifactId>protostream-processor</artifactId>
+        <version>${version.org.infinispan.protostream}</version>
+      </dependency>
       <!-- Do not add mockito-all as it is uberjar! -->
       <dependency>
         <groupId>org.mockito</groupId>

diff --git a/drools-reliability/drools-reliability-infinispan/pom.xml b/drools-reliability/drools-reliability-infinispan/pom.xml
@@ -52,7 +52,7 @@
   <dependencies>
     <dependency>
       <groupId>org.infinispan</groupId>
-      <artifactId>infinispan-core-jakarta</artifactId>
+      <artifactId>infinispan-core</artifactId>
     </dependency>
     <dependency>
       <groupId>org.infinispan.protostream</groupId>
@@ -61,7 +61,7 @@
     </dependency>
     <dependency>
       <groupId>org.infinispan</groupId>
-      <artifactId>infinispan-client-hotrod-jakarta</artifactId>
+      <artifactId>infinispan-client-hotrod</artifactId>
     </dependency>
     <dependency>
       <groupId>org.drools</groupId>

diff --git a/...ty-infinispan/src/main/java/org/drools/reliability/infinispan/EmbeddedStorageManager.java b/...ty-infinispan/src/main/java/org/drools/reliability/infinispan/EmbeddedStorageManager.java
@@ -33,6 +33,7 @@
 import org.infinispan.configuration.global.GlobalConfigurationBuilder;
 import org.infinispan.globalstate.ConfigurationStorage;
 import org.infinispan.manager.DefaultCacheManager;
+import org.infinispan.manager.EmbeddedCacheManagerAdmin;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -52,6 +53,8 @@ public class EmbeddedStorageManager implements InfinispanStorageManager {
     static final EmbeddedStorageManager INSTANCE = new EmbeddedStorageManager();
 
     private DefaultCacheManager embeddedCacheManager;
+
+    private EmbeddedCacheManagerAdmin cacheContainerAdmin;
     private Configuration cacheConfiguration;
 
     public static final String CACHE_DIR = "cache";
@@ -76,6 +79,7 @@ public void initStorageManager() {
 
         // Initialize the default Cache Manager.
         embeddedCacheManager = new DefaultCacheManager(global.build());
+        cacheContainerAdmin = embeddedCacheManager.administration();
 
         // Create a distributed cache with synchronous replication.
         ConfigurationBuilder builder = new ConfigurationBuilder();
@@ -113,7 +117,7 @@ public void close() {
     @Override
     public void removeStorage(String storageName) {
         if (embeddedCacheManager.cacheExists(storageName)) {
-            embeddedCacheManager.removeCache(storageName);
+            cacheContainerAdmin.removeCache(storageName);
         }
     }
 

diff --git a/drools-reliability/drools-reliability-tests/pom.xml b/drools-reliability/drools-reliability-tests/pom.xml
@@ -123,7 +123,7 @@
 
     <dependency>
       <groupId>org.infinispan</groupId>
-      <artifactId>infinispan-server-testdriver-core-jakarta</artifactId>
+      <artifactId>infinispan-server-testdriver-core</artifactId>
       <scope>test</scope>
       <exclusions>
         <exclusion>

diff --git a/...liability-tests/src/test/java/org/drools/reliability/test/EmbeddedStorageManagerTest.java b/...liability-tests/src/test/java/org/drools/reliability/test/EmbeddedStorageManagerTest.java
@@ -83,7 +83,7 @@ void removeCachesBySessionId_shouldRemoveSpecifiedCacheOnly() {
         assertThat(StorageManagerFactory.get().getStorageManager().getStorageNames()).containsExactlyInAnyOrder(SESSION_STORAGE_PREFIX + "0_" + "epDefault", "METADATA_0");
     }
 
-    public static class FakeCacheManager extends DefaultCacheManager {
+    public static class FakeCacheManager extends DefaultCacheManager{
 
         private Map<String, Object> cacheMap = new ConcurrentHashMap<>();
 
@@ -103,11 +103,6 @@ public boolean cacheExists(String cacheName) {
             return cacheMap.containsKey(cacheName);
         }
 
-        @Override
-        public void removeCache(String cacheName) {
-            cacheMap.remove(cacheName);
-        }
-
         @Override
         public void stop() {
             // do nothing