Merge pull request #286 from pferraro/main

Upgrade wildfly-clustering to 2.0.0.Final, Infinispan to 15.0.0.Final.
wildfly-clustering · Mar 18, 2024 · 372749a · 372749a
2 parents 006b8b0 + 29a0545
commit 372749a
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 11 deletions.
diff --git a/10.1/infinispan/remote/pom.xml b/10.1/infinispan/remote/pom.xml
@@ -61,7 +61,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.infinispan</groupId>
-			<artifactId>infinispan-client-hotrod-jakarta</artifactId>
+			<artifactId>infinispan-client-hotrod</artifactId>
 		</dependency>
 
 		<dependency>

diff --git a/...n/remote/src/main/java/org/wildfly/clustering/tomcat/infinispan/remote/HotRodManager.java b/...n/remote/src/main/java/org/wildfly/clustering/tomcat/infinispan/remote/HotRodManager.java
@@ -147,7 +147,6 @@ protected void startInternal() throws LifecycleException {
 		Configuration configuration = Optional.ofNullable(this.uri).map(HotRodURI::create).map(HotRodURI::toConfigurationBuilder).orElseGet(ConfigurationBuilder::new)
 				.withProperties(this.properties)
 				.marshaller(new ProtoStreamMarshaller(ClassLoaderMarshaller.of(containerLoader), builder -> builder.load(containerLoader)))
-				.classLoader(containerLoader)
 				.build();
 
 		configuration.addRemoteCache(deploymentName, builder -> builder.forceReturnValues(false).nearCacheMode(maxActiveSessions.isPresent() ? NearCacheMode.INVALIDATED : NearCacheMode.DISABLED).transactionMode(TransactionMode.NONE).templateName(this.templateName));

diff --git a/8.5/infinispan/remote/pom.xml b/8.5/infinispan/remote/pom.xml
@@ -61,7 +61,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.infinispan</groupId>
-			<artifactId>infinispan-client-hotrod-jakarta</artifactId>
+			<artifactId>infinispan-client-hotrod</artifactId>
 		</dependency>
 
 		<dependency>

diff --git a/...n/remote/src/main/java/org/wildfly/clustering/tomcat/infinispan/remote/HotRodManager.java b/...n/remote/src/main/java/org/wildfly/clustering/tomcat/infinispan/remote/HotRodManager.java
@@ -145,7 +145,6 @@ protected void startInternal() throws LifecycleException {
 		Configuration configuration = Optional.ofNullable(this.uri).map(HotRodURI::create).map(HotRodURI::toConfigurationBuilder).orElseGet(ConfigurationBuilder::new)
 				.withProperties(this.properties)
 				.marshaller(new ProtoStreamMarshaller(ClassLoaderMarshaller.of(containerLoader), builder -> builder.load(containerLoader)))
-				.classLoader(containerLoader)
 				.build();
 
 		configuration.addRemoteCache(deploymentName, builder -> builder.forceReturnValues(false).nearCacheMode(maxActiveSessions.isPresent() ? NearCacheMode.INVALIDATED : NearCacheMode.DISABLED).transactionMode(TransactionMode.NONE).templateName(this.templateName));

diff --git a/9.0/infinispan/remote/pom.xml b/9.0/infinispan/remote/pom.xml
@@ -63,7 +63,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.infinispan</groupId>
-			<artifactId>infinispan-client-hotrod-jakarta</artifactId>
+			<artifactId>infinispan-client-hotrod</artifactId>
 		</dependency>
 
 		<dependency>

diff --git a/...n/remote/src/main/java/org/wildfly/clustering/tomcat/infinispan/remote/HotRodManager.java b/...n/remote/src/main/java/org/wildfly/clustering/tomcat/infinispan/remote/HotRodManager.java
@@ -147,7 +147,6 @@ protected void startInternal() throws LifecycleException {
 		Configuration configuration = Optional.ofNullable(this.uri).map(HotRodURI::create).map(HotRodURI::toConfigurationBuilder).orElseGet(ConfigurationBuilder::new)
 				.withProperties(this.properties)
 				.marshaller(new ProtoStreamMarshaller(ClassLoaderMarshaller.of(containerLoader), builder -> builder.load(containerLoader)))
-				.classLoader(containerLoader)
 				.build();
 
 		configuration.addRemoteCache(deploymentName, builder -> builder.forceReturnValues(false).nearCacheMode(maxActiveSessions.isPresent() ? NearCacheMode.INVALIDATED : NearCacheMode.DISABLED).transactionMode(TransactionMode.NONE).templateName(this.templateName));

diff --git a/pom.xml b/pom.xml
@@ -27,18 +27,18 @@
 
 	<properties>
 		<jdk.runtime.args>--add-opens=java.base/java.io=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED</jdk.runtime.args>
-		<maven.compiler.target>11</maven.compiler.target>
-		<maven.compiler.source>11</maven.compiler.source>
+		<maven.compiler.target>17</maven.compiler.target>
+		<maven.compiler.source>17</maven.compiler.source>
 		<maven.repository.url>https://repository.jboss.org/nexus/content/groups/public/</maven.repository.url>
 
 		<!-- Provided dependency versions -->
 		<version.net.jcip.annotations>1.0</version.net.jcip.annotations>
 		<version.org.kohsuke.metainf-services>1.11</version.org.kohsuke.metainf-services>
 
 		<!-- Runtime dependency versions -->
-		<version.org.infinispan>14.0.25.Final</version.org.infinispan>
+		<version.org.infinispan>15.0.0.Final</version.org.infinispan>
 		<version.org.jboss.marshalling>2.1.4.Final</version.org.jboss.marshalling>
-		<version.org.wildfly.clustering>1.0.12.Final</version.org.wildfly.clustering>
+		<version.org.wildfly.clustering>2.0.0.Final</version.org.wildfly.clustering>
 
 		<!-- Test dependency versions -->
 		<version.org.jboss.arquillian>1.8.0.Final</version.org.jboss.arquillian>

diff --git a/spi/pom.xml b/spi/pom.xml
@@ -65,7 +65,7 @@
 
 		<dependency>
 			<groupId>org.infinispan</groupId>
-			<artifactId>infinispan-client-hotrod-jakarta</artifactId>
+			<artifactId>infinispan-client-hotrod</artifactId>
 			<scope>test</scope>
 		</dependency>
 		<dependency>