Skip to content

Commit c46892e

Browse files
wburnswburns
committed
Update Infinispan to 10.0.0.Final
1 parent a6d464b commit c46892e

File tree

8 files changed

+49
-27
lines changed

8 files changed

+49
-27
lines changed

‎bom/runtime/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,8 +119,8 @@
119119
<testng.version>6.14.2</testng.version>
120120
<assertj.version>3.13.2</assertj.version>
121121
<json-smart.version>2.3</json-smart.version>
122-
<infinispan.version>10.0.0.CR1</infinispan.version>
123-
<infinispan.protostream.version>4.3.0.Alpha10</infinispan.protostream.version>
122+
<infinispan.version>10.0.0.Final</infinispan.version>
123+
<infinispan.protostream.version>4.3.0.Final</infinispan.protostream.version>
124124
<caffeine.version>2.6.2</caffeine.version>
125125
<netty.version>4.1.42.Final</netty.version>
126126
<reactive-streams.version>1.0.3</reactive-streams.version>

‎extensions/infinispan-client/runtime/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@
5454
<artifactId>infinispan-client-hotrod</artifactId>
5555
<exclusions>
5656
<exclusion>
57-
<groupId>org.jboss.marshalling</groupId>
58-
<artifactId>jboss-marshalling-osgi</artifactId>
57+
<groupId>org.infinispan</groupId>
58+
<artifactId>infinispan-jboss-marshalling</artifactId>
5959
</exclusion>
6060
<exclusion>
6161
<groupId>org.jboss.spec.javax.transaction</groupId>

‎extensions/infinispan-client/runtime/src/main/java/io/quarkus/infinispan/client/runtime/InfinispanClientProducer.java‎

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package io.quarkus.infinispan.client.runtime;
22

3-
import java.io.IOException;
43
import java.io.InputStream;
54
import java.lang.annotation.Annotation;
65
import java.util.Map;
@@ -26,16 +25,15 @@
2625
import org.infinispan.client.hotrod.logging.Log;
2726
import org.infinispan.client.hotrod.logging.LogFactory;
2827
import org.infinispan.client.hotrod.marshall.ProtoStreamMarshaller;
29-
import org.infinispan.commons.CacheConfigurationException;
3028
import org.infinispan.commons.marshall.Marshaller;
3129
import org.infinispan.commons.util.Util;
3230
import org.infinispan.counter.api.CounterManager;
3331
import org.infinispan.protostream.BaseMarshaller;
3432
import org.infinispan.protostream.FileDescriptorSource;
3533
import org.infinispan.protostream.SerializationContext;
3634
import org.infinispan.protostream.SerializationContextInitializer;
35+
import org.infinispan.protostream.WrappedMessage;
3736
import org.infinispan.query.remote.client.ProtobufMetadataManagerConstants;
38-
import org.infinispan.query.remote.client.impl.MarshallerRegistration;
3937

4038
/**
4139
* Produces a configured remote cache manager instance
@@ -129,10 +127,10 @@ public static void handleProtoStreamRequirements(Properties properties) {
129127
// Note that the other half is done in QuerySubstitutions.SubstituteMarshallerRegistration class
130128
// Note that the registration of these files are done twice in normal VM mode
131129
// (once during init and once at runtime)
132-
properties.put(InfinispanClientProducer.PROTOBUF_FILE_PREFIX + MarshallerRegistration.QUERY_PROTO_RES,
133-
getContents(MarshallerRegistration.QUERY_PROTO_RES));
134-
properties.put(InfinispanClientProducer.PROTOBUF_FILE_PREFIX + MarshallerRegistration.MESSAGE_PROTO_RES,
135-
getContents(MarshallerRegistration.MESSAGE_PROTO_RES));
130+
properties.put(InfinispanClientProducer.PROTOBUF_FILE_PREFIX + WrappedMessage.PROTO_FILE,
131+
getContents("/" + WrappedMessage.PROTO_FILE));
132+
String queryProtoFile = "org/infinispan/query/remote/client/query.proto";
133+
properties.put(InfinispanClientProducer.PROTOBUF_FILE_PREFIX + queryProtoFile, getContents("/" + queryProtoFile));
136134
}
137135

138136
/**
@@ -206,11 +204,7 @@ private static void handleProtoStreamMarshaller(ProtoStreamMarshaller marshaller
206204
.get(InfinispanClientProducer.PROTOBUF_INITIALIZERS);
207205
if (initializers != null) {
208206
initializers.forEach(sci -> {
209-
try {
210-
sci.registerSchema(serializationContext);
211-
} catch (IOException e) {
212-
throw new CacheConfigurationException(e);
213-
}
207+
sci.registerSchema(serializationContext);
214208
sci.registerMarshallers(serializationContext);
215209
});
216210
}

‎extensions/infinispan-client/runtime/src/main/java/io/quarkus/infinispan/client/runtime/graal/QuerySubstitutions.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,6 @@ final class SubstituteMarshallerRegistration {
2222
public static void init(SerializationContext ctx) throws IOException {
2323
// Skip loading the proto definition files as this was already done at compile time with
2424
// HandleProtostreamMarshaller#handleQueryRequirements
25-
MarshallerRegistration.registerMarshallers(ctx);
25+
MarshallerRegistration.INSTANCE.registerMarshallers(ctx);
2626
}
2727
}

‎extensions/infinispan-embedded/deployment/src/main/java/io/quarkus/infinispan/embedded/deployment/InfinispanEmbeddedProcessor.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
1717
import org.infinispan.configuration.parsing.ConfigurationParser;
1818
import org.infinispan.distribution.ch.ConsistentHashFactory;
1919
import org.infinispan.distribution.ch.impl.HashFunctionPartitioner;
20+
import org.infinispan.factories.impl.ModuleMetadataBuilder;
2021
import org.infinispan.interceptors.AsyncInterceptor;
2122
import org.infinispan.marshall.exts.CollectionExternalizer;
2223
import org.infinispan.marshall.exts.MapExternalizer;
23-
import org.infinispan.modules.ModuleMetadataBuilder;
2424
import org.infinispan.notifications.Listener;
2525
import org.infinispan.persistence.spi.CacheLoader;
2626
import org.infinispan.persistence.spi.CacheWriter;
@@ -86,6 +86,7 @@ void setup(BuildProducer<FeatureBuildItem> feature, BuildProducer<ReflectiveClas
8686
"org/infinispan/protostream/message-wrapping.proto",
8787
"proto/generated/persistence.commons.proto",
8888
"proto/generated/persistence.core.proto",
89+
"proto/generated/global.commons.proto",
8990
"default-configs/default-jgroups-udp.xml",
9091
"default-configs/default-jgroups-tcp.xml",
9192
"default-configs/default-jgroups-kubernetes.xml",

‎extensions/infinispan-embedded/runtime/pom.xml‎

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
<artifactId>quarkus-infinispan-embedded</artifactId>
1313
<name>Quarkus - Infinispan - Embedded - Runtime</name>
14-
<description>Run an embedded Infinispan data grid server for distributed caching</description>
14+
1515
<dependencies>
1616
<dependency>
1717
<groupId>io.quarkus</groupId>
@@ -26,22 +26,27 @@
2626
<artifactId>quarkus-caffeine</artifactId>
2727
</dependency>
2828

29+
<!-- Explicitly add in smallrye-metrics so that the proper version of
30+
microprofile-metrics-api is brought along since it is excluded below
31+
This and the exclusion can be removed when updating to 10.0.1.Final of Infinispan -->
32+
<dependency>
33+
<groupId>io.smallrye</groupId>
34+
<artifactId>smallrye-metrics</artifactId>
35+
</dependency>
2936
<dependency>
3037
<groupId>org.infinispan</groupId>
3138
<artifactId>infinispan-core</artifactId>
3239
<exclusions>
40+
<exclusion>
41+
<groupId>org.eclipse.microprofile.metrics</groupId>
42+
<artifactId>microprofile-metrics-api</artifactId>
43+
</exclusion>
3344
<exclusion>
3445
<groupId>org.jboss.spec.javax.transaction</groupId>
35-
<artifactId>
36-
jboss-transaction-api_1.2_spec
37-
</artifactId>
46+
<artifactId>jboss-transaction-api_1.2_spec</artifactId>
3847
</exclusion>
3948
</exclusions>
4049
</dependency>
41-
<dependency>
42-
<groupId>jakarta.transaction</groupId>
43-
<artifactId>jakarta.transaction-api</artifactId>
44-
</dependency>
4550
<dependency>
4651
<groupId>org.jboss.narayana.jta</groupId>
4752
<artifactId>narayana-jta</artifactId>

‎integration-tests/infinispan-client/pom.xml‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,10 @@
5656
<groupId>commons-logging</groupId>
5757
<artifactId>commons-logging</artifactId>
5858
</exclusion>
59+
<exclusion>
60+
<groupId>org.hibernate</groupId>
61+
<artifactId>hibernate-search-serialization-avro</artifactId>
62+
</exclusion>
5963
</exclusions>
6064
<scope>test</scope>
6165
</dependency>
@@ -76,6 +80,24 @@
7680
<type>test-jar</type>
7781
<scope>test</scope>
7882
</dependency>
83+
84+
<!-- We override these to satisfy Infinispan server -->
85+
<dependency>
86+
<groupId>com.fasterxml.jackson.core</groupId>
87+
<artifactId>jackson-core</artifactId>
88+
<version>2.10.0</version>
89+
</dependency>
90+
<dependency>
91+
<groupId>com.fasterxml.jackson.core</groupId>
92+
<artifactId>jackson-databind</artifactId>
93+
<version>2.10.0</version>
94+
</dependency>
95+
<dependency>
96+
<groupId>com.fasterxml.jackson.core</groupId>
97+
<artifactId>jackson-annotations</artifactId>
98+
<version>2.10.0</version>
99+
</dependency>
100+
79101
</dependencies>
80102

81103
<build>

‎integration-tests/infinispan-embedded/src/main/resources/10.0.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,7 @@
304304
</local-cache>
305305
<local-cache name="off-heap-memory">
306306
<memory>
307-
<off-heap size="10000000" eviction="MEMORY" address-count="4"/>
307+
<off-heap size="10000000" eviction="MEMORY"/>
308308
</memory>
309309
</local-cache>
310310
<local-cache name="binary-memory">

0 commit comments

Comments
 (0)