You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2024/03/25 14:08:25 UTC
(camel) branch main updated: CAMEL-20571: Upgrade Infinispan to 15.0.0.Final (#13605)
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new 7ae83c1ce0f CAMEL-20571: Upgrade Infinispan to 15.0.0.Final (#13605)
7ae83c1ce0f is described below
commit 7ae83c1ce0f5535f64d7a8eab84839e6c6da9473
Author: James Netherton <ja...@users.noreply.github.com>
AuthorDate: Mon Mar 25 14:08:19 2024 +0000
CAMEL-20571: Upgrade Infinispan to 15.0.0.Final (#13605)
---
.../camel-infinispan-common/pom.xml | 2 +-
.../camel-infinispan-embedded/pom.xml | 24 +++++++++++++++-------
.../embedded/InfinispanEmbeddedEventListener.java | 2 +-
.../InfinispanEmbeddedClusteredTestSupport.java | 2 +-
.../embedded/InfinispanEmbeddedProducerTest.java | 2 +-
.../embedded/InfinispanEmbeddedTestSupport.java | 2 +-
...anEmbeddedIdempotentRepositoryConfiguration.xml | 4 ++--
.../camel-infinispan/camel-infinispan/pom.xml | 19 +++++++----------
.../infinispan/remote/InfinispanRemoteManager.java | 6 ------
.../remote/InfinispanRemoteQueryConsumerIT.java | 6 +++---
.../remote/InfinispanRemoteQueryProducerIT.java | 6 +++---
.../remote/InfinispanRemoteQueryTestSupport.java | 2 +-
parent/pom.xml | 4 ++--
.../src/test/resources/infinispan.xml | 10 ++++-----
.../infra/infinispan/services/container.properties | 2 +-
15 files changed, 46 insertions(+), 47 deletions(-)
diff --git a/components/camel-infinispan/camel-infinispan-common/pom.xml b/components/camel-infinispan/camel-infinispan-common/pom.xml
index 574d8b26d95..2a3bedaa0f0 100644
--- a/components/camel-infinispan/camel-infinispan-common/pom.xml
+++ b/components/camel-infinispan/camel-infinispan-common/pom.xml
@@ -47,7 +47,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/components/camel-infinispan/camel-infinispan-embedded/pom.xml b/components/camel-infinispan/camel-infinispan-embedded/pom.xml
index dab5c87bb58..522e73675df 100644
--- a/components/camel-infinispan/camel-infinispan-embedded/pom.xml
+++ b/components/camel-infinispan/camel-infinispan-embedded/pom.xml
@@ -39,12 +39,17 @@
</dependency>
<dependency>
<groupId>org.infinispan</groupId>
- <artifactId>infinispan-core-jakarta</artifactId>
+ <artifactId>infinispan-commons</artifactId>
<version>${infinispan-version}</version>
</dependency>
<dependency>
<groupId>org.infinispan</groupId>
- <artifactId>infinispan-query-jakarta</artifactId>
+ <artifactId>infinispan-core</artifactId>
+ <version>${infinispan-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.infinispan</groupId>
+ <artifactId>infinispan-query</artifactId>
<version>${infinispan-version}</version>
</dependency>
<dependency>
@@ -75,7 +80,14 @@
<!-- testing - infinispan -->
<dependency>
<groupId>org.infinispan</groupId>
- <artifactId>infinispan-core-jakarta</artifactId>
+ <artifactId>infinispan-core</artifactId>
+ <version>${infinispan-version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.infinispan</groupId>
+ <artifactId>infinispan-commons</artifactId>
<version>${infinispan-version}</version>
<type>test-jar</type>
<scope>test</scope>
@@ -138,10 +150,8 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<systemPropertyVariables>
- <property>
- <name>infinispan.test.jgroups.protocol</name>
- <value>tcp</value>
- </property>
+ <infinispan.test.jgroups.protocol>tcp</infinispan.test.jgroups.protocol>
+ <infinispan.server.log.path>${project.build.directory}</infinispan.server.log.path>
</systemPropertyVariables>
</configuration>
</plugin>
diff --git a/components/camel-infinispan/camel-infinispan-embedded/src/main/java/org/apache/camel/component/infinispan/embedded/InfinispanEmbeddedEventListener.java b/components/camel-infinispan/camel-infinispan-embedded/src/main/java/org/apache/camel/component/infinispan/embedded/InfinispanEmbeddedEventListener.java
index bd975008be5..706d9e585ff 100644
--- a/components/camel-infinispan/camel-infinispan-embedded/src/main/java/org/apache/camel/component/infinispan/embedded/InfinispanEmbeddedEventListener.java
+++ b/components/camel-infinispan/camel-infinispan-embedded/src/main/java/org/apache/camel/component/infinispan/embedded/InfinispanEmbeddedEventListener.java
@@ -114,7 +114,7 @@ public abstract class InfinispanEmbeddedEventListener extends InfinispanEventLis
event.getType().toString(),
event.getCache().getName(),
event.getKey(),
- event.getValue(),
+ event.getNewValue(),
e -> {
e.getMessage().setHeader(InfinispanConstants.IS_PRE, event.isPre());
e.getMessage().setHeader(InfinispanConstants.COMMAND_RETRIED, event.isCommandRetried());
diff --git a/components/camel-infinispan/camel-infinispan-embedded/src/test/java/org/apache/camel/component/infinispan/embedded/InfinispanEmbeddedClusteredTestSupport.java b/components/camel-infinispan/camel-infinispan-embedded/src/test/java/org/apache/camel/component/infinispan/embedded/InfinispanEmbeddedClusteredTestSupport.java
index cfeee757455..3557c9de9b5 100644
--- a/components/camel-infinispan/camel-infinispan-embedded/src/test/java/org/apache/camel/component/infinispan/embedded/InfinispanEmbeddedClusteredTestSupport.java
+++ b/components/camel-infinispan/camel-infinispan-embedded/src/test/java/org/apache/camel/component/infinispan/embedded/InfinispanEmbeddedClusteredTestSupport.java
@@ -24,6 +24,7 @@ import org.apache.camel.spi.ComponentCustomizer;
import org.apache.camel.test.junit5.CamelTestSupport;
import org.infinispan.Cache;
import org.infinispan.commons.api.BasicCacheContainer;
+import org.infinispan.commons.time.ControlledTimeService;
import org.infinispan.commons.time.TimeService;
import org.infinispan.configuration.cache.CacheMode;
import org.infinispan.configuration.cache.ConfigurationBuilder;
@@ -31,7 +32,6 @@ import org.infinispan.manager.EmbeddedCacheManager;
import org.infinispan.test.MultipleCacheManagersTest;
import org.infinispan.test.TestDataSCI;
import org.infinispan.test.TestingUtil;
-import org.infinispan.util.ControlledTimeService;
public class InfinispanEmbeddedClusteredTestSupport extends CamelTestSupport {
protected List<EmbeddedCacheManager> clusteredCacheContainers;
diff --git a/components/camel-infinispan/camel-infinispan-embedded/src/test/java/org/apache/camel/component/infinispan/embedded/InfinispanEmbeddedProducerTest.java b/components/camel-infinispan/camel-infinispan-embedded/src/test/java/org/apache/camel/component/infinispan/embedded/InfinispanEmbeddedProducerTest.java
index 9abe559e1e3..22a4a71f7b4 100644
--- a/components/camel-infinispan/camel-infinispan-embedded/src/test/java/org/apache/camel/component/infinispan/embedded/InfinispanEmbeddedProducerTest.java
+++ b/components/camel-infinispan/camel-infinispan-embedded/src/test/java/org/apache/camel/component/infinispan/embedded/InfinispanEmbeddedProducerTest.java
@@ -72,7 +72,7 @@ public class InfinispanEmbeddedProducerTest extends InfinispanEmbeddedTestSuppor
.to("direct:start")
.withHeader(InfinispanConstants.OPERATION, InfinispanOperation.STATS)
.request(Stats.class)
- .getTotalNumberOfEntries());
+ .getApproximateEntries());
}
// *****************************
diff --git a/components/camel-infinispan/camel-infinispan-embedded/src/test/java/org/apache/camel/component/infinispan/embedded/InfinispanEmbeddedTestSupport.java b/components/camel-infinispan/camel-infinispan-embedded/src/test/java/org/apache/camel/component/infinispan/embedded/InfinispanEmbeddedTestSupport.java
index f99da996eef..1fc01395f32 100644
--- a/components/camel-infinispan/camel-infinispan-embedded/src/test/java/org/apache/camel/component/infinispan/embedded/InfinispanEmbeddedTestSupport.java
+++ b/components/camel-infinispan/camel-infinispan-embedded/src/test/java/org/apache/camel/component/infinispan/embedded/InfinispanEmbeddedTestSupport.java
@@ -21,13 +21,13 @@ import org.apache.camel.component.infinispan.InfinispanTestSupport;
import org.apache.camel.spi.ComponentCustomizer;
import org.infinispan.commons.api.BasicCache;
import org.infinispan.commons.api.CacheContainerAdmin;
+import org.infinispan.commons.time.ControlledTimeService;
import org.infinispan.commons.time.TimeService;
import org.infinispan.configuration.cache.CacheMode;
import org.infinispan.configuration.cache.ConfigurationBuilder;
import org.infinispan.manager.DefaultCacheManager;
import org.infinispan.manager.EmbeddedCacheManager;
import org.infinispan.test.TestingUtil;
-import org.infinispan.util.ControlledTimeService;
import org.junit.jupiter.api.MethodOrderer;
import org.junit.jupiter.api.TestMethodOrder;
diff --git a/components/camel-infinispan/camel-infinispan-embedded/src/test/resources/org/apache/camel/component/infinispan/spring/SpringInfinispanEmbeddedIdempotentRepositoryConfiguration.xml b/components/camel-infinispan/camel-infinispan-embedded/src/test/resources/org/apache/camel/component/infinispan/spring/SpringInfinispanEmbeddedIdempotentRepositoryConfiguration.xml
index e636a7df2e2..6dc3f1ee529 100644
--- a/components/camel-infinispan/camel-infinispan-embedded/src/test/resources/org/apache/camel/component/infinispan/spring/SpringInfinispanEmbeddedIdempotentRepositoryConfiguration.xml
+++ b/components/camel-infinispan/camel-infinispan-embedded/src/test/resources/org/apache/camel/component/infinispan/spring/SpringInfinispanEmbeddedIdempotentRepositoryConfiguration.xml
@@ -19,8 +19,8 @@
-->
<infinispan
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:infinispan:config:11.0 https://infinispan.org/schemas/infinispan-config-11.0.xsd"
- xmlns="urn:infinispan:config:11.0">
+ xsi:schemaLocation="urn:infinispan:config:15.0 https://infinispan.org/schemas/infinispan-config-15.0.xsd"
+ xmlns="urn:infinispan:config:15.0">
<cache-container default-cache="default">
<local-cache name="default">
diff --git a/components/camel-infinispan/camel-infinispan/pom.xml b/components/camel-infinispan/camel-infinispan/pom.xml
index fe79bf75ea0..6b4a9a2fd7e 100644
--- a/components/camel-infinispan/camel-infinispan/pom.xml
+++ b/components/camel-infinispan/camel-infinispan/pom.xml
@@ -50,7 +50,7 @@
</dependency>
<dependency>
<groupId>org.infinispan</groupId>
- <artifactId>infinispan-client-hotrod-jakarta</artifactId>
+ <artifactId>infinispan-client-hotrod</artifactId>
<version>${infinispan-version}</version>
<exclusions>
<exclusion>
@@ -101,7 +101,7 @@
<!-- testing - infinispan -->
<dependency>
<groupId>org.infinispan</groupId>
- <artifactId>infinispan-core-jakarta</artifactId>
+ <artifactId>infinispan-core</artifactId>
<version>${infinispan-version}</version>
<scope>test</scope>
</dependency>
@@ -121,20 +121,15 @@
</dependency>
<dependency>
<groupId>org.infinispan</groupId>
- <artifactId>infinispan-spring5-remote</artifactId>
- <version>${infinispan-version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.infinispan</groupId>
- <artifactId>proto-sample-domain-definition</artifactId>
+ <artifactId>infinispan-spring6-remote</artifactId>
<version>${infinispan-version}</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.infinispan</groupId>
- <artifactId>proto-sample-domain-implementation</artifactId>
- <version>${infinispan-version}</version>
+ <groupId>org.infinispan.protostream</groupId>
+ <artifactId>protostream</artifactId>
+ <version>${protostream-version}</version>
+ <type>test-jar</type>
<scope>test</scope>
</dependency>
diff --git a/components/camel-infinispan/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteManager.java b/components/camel-infinispan/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteManager.java
index a3d7152e00c..2f646696744 100644
--- a/components/camel-infinispan/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteManager.java
+++ b/components/camel-infinispan/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteManager.java
@@ -79,12 +79,6 @@ public class InfinispanRemoteManager extends ServiceSupport implements Infinispa
ConfigurationBuilder builder = new ConfigurationBuilder();
builder.addServers(configuration.getHosts());
- if (camelContext != null && camelContext.getApplicationContextClassLoader() != null) {
- builder.classLoader(camelContext.getApplicationContextClassLoader());
- } else {
- builder.classLoader(Thread.currentThread().getContextClassLoader());
- }
-
if (configuration.isSecure()) {
if (ObjectHelper.isNotEmpty(configuration.getUsername())
&& ObjectHelper.isNotEmpty(configuration.getPassword())) {
diff --git a/components/camel-infinispan/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteQueryConsumerIT.java b/components/camel-infinispan/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteQueryConsumerIT.java
index e5e8fd17074..c3f57e4b6fd 100644
--- a/components/camel-infinispan/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteQueryConsumerIT.java
+++ b/components/camel-infinispan/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteQueryConsumerIT.java
@@ -28,9 +28,9 @@ import org.infinispan.commons.marshall.ProtoStreamMarshaller;
import org.infinispan.commons.util.Util;
import org.infinispan.protostream.FileDescriptorSource;
import org.infinispan.protostream.SerializationContext;
-import org.infinispan.protostream.sampledomain.User;
-import org.infinispan.protostream.sampledomain.marshallers.GenderMarshaller;
-import org.infinispan.protostream.sampledomain.marshallers.UserMarshaller;
+import org.infinispan.protostream.domain.User;
+import org.infinispan.protostream.domain.marshallers.GenderMarshaller;
+import org.infinispan.protostream.domain.marshallers.UserMarshaller;
import org.infinispan.query.remote.client.ProtobufMetadataManagerConstants;
import org.infinispan.query.remote.client.impl.MarshallerRegistration;
import org.junit.jupiter.api.BeforeEach;
diff --git a/components/camel-infinispan/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteQueryProducerIT.java b/components/camel-infinispan/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteQueryProducerIT.java
index 530b47fdfe9..3ecb817d0e1 100644
--- a/components/camel-infinispan/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteQueryProducerIT.java
+++ b/components/camel-infinispan/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteQueryProducerIT.java
@@ -31,9 +31,9 @@ import org.infinispan.commons.marshall.ProtoStreamMarshaller;
import org.infinispan.commons.util.Util;
import org.infinispan.protostream.FileDescriptorSource;
import org.infinispan.protostream.SerializationContext;
-import org.infinispan.protostream.sampledomain.User;
-import org.infinispan.protostream.sampledomain.marshallers.GenderMarshaller;
-import org.infinispan.protostream.sampledomain.marshallers.UserMarshaller;
+import org.infinispan.protostream.domain.User;
+import org.infinispan.protostream.domain.marshallers.GenderMarshaller;
+import org.infinispan.protostream.domain.marshallers.UserMarshaller;
import org.infinispan.query.remote.client.ProtobufMetadataManagerConstants;
import org.infinispan.query.remote.client.impl.MarshallerRegistration;
import org.junit.jupiter.api.BeforeEach;
diff --git a/components/camel-infinispan/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteQueryTestSupport.java b/components/camel-infinispan/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteQueryTestSupport.java
index cefa0e17502..f09aeada4de 100644
--- a/components/camel-infinispan/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteQueryTestSupport.java
+++ b/components/camel-infinispan/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteQueryTestSupport.java
@@ -18,7 +18,7 @@ package org.apache.camel.component.infinispan.remote;
import java.util.List;
-import org.infinispan.protostream.sampledomain.User;
+import org.infinispan.protostream.domain.User;
public class InfinispanRemoteQueryTestSupport extends InfinispanRemoteTestSupport {
diff --git a/parent/pom.xml b/parent/pom.xml
index 8637ec50a55..5274ccef6a5 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -221,7 +221,7 @@
<icu4j-version>74.2</icu4j-version>
<ignite-version>2.16.0</ignite-version>
<impsort-maven-plugin-version>1.9.0</impsort-maven-plugin-version>
- <infinispan-version>14.0.26.Final</infinispan-version>
+ <infinispan-version>15.0.0.Final</infinispan-version>
<influx-java-driver-version>2.24</influx-java-driver-version>
<influx-client-java-driver-version>7.0.0</influx-client-java-driver-version>
<irclib-version>1.10</irclib-version>
@@ -398,7 +398,7 @@
<protobuf-version>3.25.3</protobuf-version>
<protobuf-maven-plugin-version>0.6.1</protobuf-maven-plugin-version>
<protonpack-version>1.8</protonpack-version>
- <protostream-version>4.6.5.Final</protostream-version>
+ <protostream-version>5.0.1.Final</protostream-version>
<prowide-version>SRU2023-10.1.4</prowide-version>
<pubnub-version>6.4.5</pubnub-version>
<pulsar-version>3.2.1</pulsar-version>
diff --git a/test-infra/camel-test-infra-infinispan/src/test/resources/infinispan.xml b/test-infra/camel-test-infra-infinispan/src/test/resources/infinispan.xml
index 9360f130a4f..13aa3f117ca 100644
--- a/test-infra/camel-test-infra-infinispan/src/test/resources/infinispan.xml
+++ b/test-infra/camel-test-infra-infinispan/src/test/resources/infinispan.xml
@@ -19,10 +19,10 @@
-->
<infinispan
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:infinispan:config:14.0 https://infinispan.org/schemas/infinispan-config-14.0.xsd
- urn:infinispan:server:14.0 https://infinispan.org/schemas/infinispan-server-14.0.xsd"
- xmlns="urn:infinispan:config:14.0"
- xmlns:server="urn:infinispan:server:14.0">
+ xsi:schemaLocation="urn:infinispan:config:15.0 https://infinispan.org/schemas/infinispan-config-15.0.xsd
+ urn:infinispan:server:15.0 https://infinispan.org/schemas/infinispan-server-15.0.xsd"
+ xmlns="urn:infinispan:config:15.0"
+ xmlns:server="urn:infinispan:server:15.0">
<cache-container name="default" statistics="true">
<transport cluster="${infinispan.cluster.name:cluster}" stack="${infinispan.cluster.stack:tcp}" node-name="${infinispan.node.name:}"/>
@@ -31,7 +31,7 @@
</security>
</cache-container>
- <server xmlns="urn:infinispan:server:14.0">
+ <server xmlns="urn:infinispan:server:15.0">
<interfaces>
<interface name="public">
<inet-address value="${infinispan.bind.address:127.0.0.1}"/>
diff --git a/test-infra/camel-test-infra-infinispan/src/test/resources/org/apache/camel/test/infra/infinispan/services/container.properties b/test-infra/camel-test-infra-infinispan/src/test/resources/org/apache/camel/test/infra/infinispan/services/container.properties
index 649949a2c3b..9b717dc5484 100644
--- a/test-infra/camel-test-infra-infinispan/src/test/resources/org/apache/camel/test/infra/infinispan/services/container.properties
+++ b/test-infra/camel-test-infra-infinispan/src/test/resources/org/apache/camel/test/infra/infinispan/services/container.properties
@@ -14,4 +14,4 @@
## See the License for the specific language governing permissions and
## limitations under the License.
## ---------------------------------------------------------------------------
-infinispan.container=quay.io/infinispan/server:14.0.24.Final
+infinispan.container=quay.io/infinispan/server:15.0.0.Final