Update Infinispan to 10.0.0.Final

quarkusio · Nov 7, 2019 · c46892e · c46892e
1 parent a6d464b
commit c46892e
Show file tree

Hide file tree

Showing 8 changed files with 49 additions and 27 deletions.
diff --git a/bom/runtime/pom.xml b/bom/runtime/pom.xml
@@ -119,8 +119,8 @@
         <testng.version>6.14.2</testng.version>
         <assertj.version>3.13.2</assertj.version>
         <json-smart.version>2.3</json-smart.version>
-        <infinispan.version>10.0.0.CR1</infinispan.version>
-        <infinispan.protostream.version>4.3.0.Alpha10</infinispan.protostream.version>
+        <infinispan.version>10.0.0.Final</infinispan.version>
+        <infinispan.protostream.version>4.3.0.Final</infinispan.protostream.version>
         <caffeine.version>2.6.2</caffeine.version>
         <netty.version>4.1.42.Final</netty.version>
         <reactive-streams.version>1.0.3</reactive-streams.version>

diff --git a/extensions/infinispan-client/runtime/pom.xml b/extensions/infinispan-client/runtime/pom.xml
@@ -54,8 +54,8 @@
             <artifactId>infinispan-client-hotrod</artifactId>
             <exclusions>
                 <exclusion>
-                    <groupId>org.jboss.marshalling</groupId>
-                    <artifactId>jboss-marshalling-osgi</artifactId>
+                    <groupId>org.infinispan</groupId>
+                    <artifactId>infinispan-jboss-marshalling</artifactId>
                 </exclusion>
                 <exclusion>
                     <groupId>org.jboss.spec.javax.transaction</groupId>

diff --git a/.../runtime/src/main/java/io/quarkus/infinispan/client/runtime/InfinispanClientProducer.java b/.../runtime/src/main/java/io/quarkus/infinispan/client/runtime/InfinispanClientProducer.java
@@ -1,6 +1,5 @@
 package io.quarkus.infinispan.client.runtime;
 
-import java.io.IOException;
 import java.io.InputStream;
 import java.lang.annotation.Annotation;
 import java.util.Map;
@@ -26,16 +25,15 @@
 import org.infinispan.client.hotrod.logging.Log;
 import org.infinispan.client.hotrod.logging.LogFactory;
 import org.infinispan.client.hotrod.marshall.ProtoStreamMarshaller;
-import org.infinispan.commons.CacheConfigurationException;
 import org.infinispan.commons.marshall.Marshaller;
 import org.infinispan.commons.util.Util;
 import org.infinispan.counter.api.CounterManager;
 import org.infinispan.protostream.BaseMarshaller;
 import org.infinispan.protostream.FileDescriptorSource;
 import org.infinispan.protostream.SerializationContext;
 import org.infinispan.protostream.SerializationContextInitializer;
+import org.infinispan.protostream.WrappedMessage;
 import org.infinispan.query.remote.client.ProtobufMetadataManagerConstants;
-import org.infinispan.query.remote.client.impl.MarshallerRegistration;
 
 /**
  * Produces a configured remote cache manager instance
@@ -129,10 +127,10 @@ public static void handleProtoStreamRequirements(Properties 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.put(InfinispanClientProducer.PROTOBUF_FILE_PREFIX + MarshallerRegistration.QUERY_PROTO_RES,
-                getContents(MarshallerRegistration.QUERY_PROTO_RES));
-        properties.put(InfinispanClientProducer.PROTOBUF_FILE_PREFIX + MarshallerRegistration.MESSAGE_PROTO_RES,
-                getContents(MarshallerRegistration.MESSAGE_PROTO_RES));
+        properties.put(InfinispanClientProducer.PROTOBUF_FILE_PREFIX + WrappedMessage.PROTO_FILE,
+                getContents("/" + WrappedMessage.PROTO_FILE));
+        String queryProtoFile = "org/infinispan/query/remote/client/query.proto";
+        properties.put(InfinispanClientProducer.PROTOBUF_FILE_PREFIX + queryProtoFile, getContents("/" + queryProtoFile));
     }
 
     /**
@@ -206,11 +204,7 @@ private static void handleProtoStreamMarshaller(ProtoStreamMarshaller marshaller
                 .get(InfinispanClientProducer.PROTOBUF_INITIALIZERS);
         if (initializers != null) {
             initializers.forEach(sci -> {
-                try {
-                    sci.registerSchema(serializationContext);
-                } catch (IOException e) {
-                    throw new CacheConfigurationException(e);
-                }
+                sci.registerSchema(serializationContext);
                 sci.registerMarshallers(serializationContext);
             });
         }

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
@@ -22,6 +22,6 @@ final class SubstituteMarshallerRegistration {
     public static void init(SerializationContext ctx) throws IOException {
         // Skip loading the proto definition files as this was already done at compile time with
         // HandleProtostreamMarshaller#handleQueryRequirements
-        MarshallerRegistration.registerMarshallers(ctx);
+        MarshallerRegistration.INSTANCE.registerMarshallers(ctx);
     }
 }
diff --git a/.../src/main/java/io/quarkus/infinispan/embedded/deployment/InfinispanEmbeddedProcessor.java b/.../src/main/java/io/quarkus/infinispan/embedded/deployment/InfinispanEmbeddedProcessor.java
@@ -17,10 +17,10 @@
 import org.infinispan.configuration.parsing.ConfigurationParser;
 import org.infinispan.distribution.ch.ConsistentHashFactory;
 import org.infinispan.distribution.ch.impl.HashFunctionPartitioner;
+import org.infinispan.factories.impl.ModuleMetadataBuilder;
 import org.infinispan.interceptors.AsyncInterceptor;
 import org.infinispan.marshall.exts.CollectionExternalizer;
 import org.infinispan.marshall.exts.MapExternalizer;
-import org.infinispan.modules.ModuleMetadataBuilder;
 import org.infinispan.notifications.Listener;
 import org.infinispan.persistence.spi.CacheLoader;
 import org.infinispan.persistence.spi.CacheWriter;
@@ -86,6 +86,7 @@ void setup(BuildProducer<FeatureBuildItem> feature, BuildProducer<ReflectiveClas
                 "org/infinispan/protostream/message-wrapping.proto",
                 "proto/generated/persistence.commons.proto",
                 "proto/generated/persistence.core.proto",
+                "proto/generated/global.commons.proto",
                 "default-configs/default-jgroups-udp.xml",
                 "default-configs/default-jgroups-tcp.xml",
                 "default-configs/default-jgroups-kubernetes.xml",

diff --git a/extensions/infinispan-embedded/runtime/pom.xml b/extensions/infinispan-embedded/runtime/pom.xml
@@ -11,7 +11,7 @@
 
     <artifactId>quarkus-infinispan-embedded</artifactId>
     <name>Quarkus - Infinispan - Embedded - Runtime</name>
-    <description>Run an embedded Infinispan data grid server for distributed caching</description>
+
     <dependencies>
         <dependency>
             <groupId>io.quarkus</groupId>
@@ -26,22 +26,27 @@
             <artifactId>quarkus-caffeine</artifactId>
         </dependency>
 
+        <!-- Explicitly add in smallrye-metrics so that the proper version of
+             microprofile-metrics-api is brought along since it is excluded below
+             This and the exclusion can be removed when updating to 10.0.1.Final of Infinispan -->
+        <dependency>
+            <groupId>io.smallrye</groupId>
+            <artifactId>smallrye-metrics</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.infinispan</groupId>
             <artifactId>infinispan-core</artifactId>
             <exclusions>
+                <exclusion>
+                    <groupId>org.eclipse.microprofile.metrics</groupId>
+                    <artifactId>microprofile-metrics-api</artifactId>
+                </exclusion>
                 <exclusion>
                     <groupId>org.jboss.spec.javax.transaction</groupId>
-                    <artifactId>
-                        jboss-transaction-api_1.2_spec
-                    </artifactId>
+                    <artifactId>jboss-transaction-api_1.2_spec</artifactId>
                 </exclusion>
             </exclusions>
         </dependency>
-        <dependency>
-            <groupId>jakarta.transaction</groupId>
-            <artifactId>jakarta.transaction-api</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.jboss.narayana.jta</groupId>
             <artifactId>narayana-jta</artifactId>

diff --git a/integration-tests/infinispan-client/pom.xml b/integration-tests/infinispan-client/pom.xml
@@ -56,6 +56,10 @@
                     <groupId>commons-logging</groupId>
                     <artifactId>commons-logging</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>org.hibernate</groupId>
+                    <artifactId>hibernate-search-serialization-avro</artifactId>
+                </exclusion>
             </exclusions>
             <scope>test</scope>
         </dependency>
@@ -76,6 +80,24 @@
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
+
+        <!-- We override these to satisfy Infinispan server -->
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-core</artifactId>
+            <version>2.10.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <version>2.10.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
+            <version>2.10.0</version>
+        </dependency>
+
     </dependencies>
 
     <build>

diff --git a/integration-tests/infinispan-embedded/src/main/resources/10.0.xml b/integration-tests/infinispan-embedded/src/main/resources/10.0.xml
@@ -304,7 +304,7 @@
       </local-cache>
       <local-cache name="off-heap-memory">
          <memory>
-            <off-heap size="10000000" eviction="MEMORY" address-count="4"/>
+            <off-heap size="10000000" eviction="MEMORY"/>
          </memory>
       </local-cache>
       <local-cache name="binary-memory">