Merge pull request quarkusio#39158 from karesti/upgrade-infinispan-15…

…-CR1 Updates to Infinispan 15.0.0.CR1
turing85 · Mar 5, 2024 · 18df2f3 · 18df2f3
2 parents a5efd43 + 170f011
commit 18df2f3
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 90 deletions.
diff --git a/bom/application/pom.xml b/bom/application/pom.xml
@@ -140,8 +140,8 @@
         <rest-assured.version>5.4.0</rest-assured.version>
         <hamcrest.version>2.2</hamcrest.version><!-- The version needs to be compatible with both REST Assured and Awaitility -->
         <junit.jupiter.version>5.10.2</junit.jupiter.version>
-        <infinispan.version>14.0.25.Final</infinispan.version>
-        <infinispan.protostream.version>4.6.5.Final</infinispan.protostream.version>
+        <infinispan.version>15.0.0.CR1</infinispan.version>
+        <infinispan.protostream.version>5.0.0.CR2</infinispan.protostream.version>
         <caffeine.version>3.1.5</caffeine.version>
         <netty.version>4.1.107.Final</netty.version>
         <brotli4j.version>1.14.0</brotli4j.version>
@@ -5409,7 +5409,7 @@
             </dependency>
             <dependency>
                 <groupId>org.infinispan</groupId>
-                <artifactId>infinispan-client-hotrod-jakarta</artifactId>
+                <artifactId>infinispan-client-hotrod</artifactId>
                 <version>${infinispan.version}</version>
             </dependency>
             <dependency>
@@ -5452,7 +5452,7 @@
             </dependency>
             <dependency>
                 <groupId>org.infinispan</groupId>
-                <artifactId>infinispan-commons-jakarta</artifactId>
+                <artifactId>infinispan-commons</artifactId>
                 <version>${infinispan.version}</version>
             </dependency>
             <dependency>

diff --git a/...ment/src/main/java/io/quarkus/infinispan/client/deployment/InfinispanClientProcessor.java b/...ment/src/main/java/io/quarkus/infinispan/client/deployment/InfinispanClientProcessor.java
@@ -47,7 +47,6 @@
 import org.infinispan.protostream.FileDescriptorSource;
 import org.infinispan.protostream.GeneratedSchema;
 import org.infinispan.protostream.MessageMarshaller;
-import org.infinispan.protostream.RawProtobufMarshaller;
 import org.infinispan.protostream.SerializationContextInitializer;
 import org.infinispan.protostream.WrappedMessage;
 import org.jboss.jandex.AnnotationInstance;
@@ -142,20 +141,7 @@ NativeImageFeatureBuildItem nativeImageFeature() {
     @BuildStep
     public void handleProtoStreamRequirements(BuildProducer<MarshallingBuildItem> protostreamPropertiesBuildItem)
             throws ClassNotFoundException {
-        // We only apply this if we are in native mode in build time to apply to the properties
-        // Note that the other half is done in QuerySubstitutions.SubstituteMarshallerRegistration class
-        // Note that the registration of these files are done twice in normal VM mode
-        // (once during init and once at runtime)
         Properties properties = new Properties();
-        try {
-            properties.put(PROTOBUF_FILE_PREFIX + WrappedMessage.PROTO_FILE,
-                    getContents("/" + WrappedMessage.PROTO_FILE));
-            String queryProtoFile = "org/infinispan/query/remote/client/query.proto";
-            properties.put(PROTOBUF_FILE_PREFIX + queryProtoFile, getContents("/" + queryProtoFile));
-        } catch (Exception ex) {
-            // Do nothing if fails
-        }
-
         Map<String, Object> marshallers = new HashMap<>();
         initMarshaller(InfinispanClientUtil.DEFAULT_INFINISPAN_CLIENT_NAME,
                 infinispanClientsBuildTimeConfig.defaultInfinispanClient.marshallerClass, marshallers);
@@ -205,6 +191,8 @@ InfinispanPropertiesBuildItem setup(ApplicationArchivesBuildItem applicationArch
         additionalBeans.produce(AdditionalBeanBuildItem.builder().addBeanClass(InfinispanClientName.class).build());
         additionalBeans.produce(AdditionalBeanBuildItem.builder().addBeanClass(Remote.class).build());
 
+        resourceBuildItem.produce(new NativeImageResourceBuildItem("proto/generated/query.proto"));
+        resourceBuildItem.produce(new NativeImageResourceBuildItem(WrappedMessage.PROTO_FILE));
         hotDeployment
                 .produce(new HotDeploymentWatchedFileBuildItem(META_INF + File.separator + DEFAULT_HOTROD_CLIENT_PROPERTIES));
 
@@ -460,7 +448,7 @@ private void addMaxEntries(String clientName, InfinispanClientBuildTimeConfig co
     @BuildStep
     UnremovableBeanBuildItem ensureBeanLookupAvailable() {
         return UnremovableBeanBuildItem.beanTypes(BaseMarshaller.class, EnumMarshaller.class, MessageMarshaller.class,
-                RawProtobufMarshaller.class, FileDescriptorSource.class);
+                FileDescriptorSource.class);
     }
 
     @BuildStep

diff --git a/extensions/infinispan-client/runtime/pom.xml b/extensions/infinispan-client/runtime/pom.xml
@@ -67,7 +67,7 @@
         </dependency>
         <dependency>
             <groupId>org.infinispan</groupId>
-            <artifactId>infinispan-client-hotrod-jakarta</artifactId>
+            <artifactId>infinispan-client-hotrod</artifactId>
             <exclusions>
                 <exclusion>
                     <groupId>org.infinispan</groupId>

diff --git a/.../runtime/src/main/java/io/quarkus/infinispan/client/runtime/graal/QuerySubstitutions.java b/.../runtime/src/main/java/io/quarkus/infinispan/client/runtime/graal/QuerySubstitutions.java
diff --git a/...uarkus/infinispan/client/runtime/graal/SubstituteExecutorFactoryConfigurationBuilder.java b/...uarkus/infinispan/client/runtime/graal/SubstituteExecutorFactoryConfigurationBuilder.java