You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2023/08/22 04:25:03 UTC
[camel] branch main updated: Upgrade infinispan 14.0.14 (#11163)
This is an automated email from the ASF dual-hosted git repository.
davsclaus 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 8b1c982d24c Upgrade infinispan 14.0.14 (#11163)
8b1c982d24c is described below
commit 8b1c982d24cd8b8046adddb3262b4975e333c207
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Tue Aug 22 06:24:57 2023 +0200
Upgrade infinispan 14.0.14 (#11163)
* Upgrade infinispan 14.0.14
* Upgrade infinispan 14.0.14
---
.../infinispan/remote/InfinispanRemoteAggregationRepository.java | 3 ++-
parent/pom.xml | 2 +-
.../infra/infinispan/services/InfinispanLocalContainerService.java | 2 +-
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/components/camel-infinispan/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteAggregationRepository.java b/components/camel-infinispan/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteAggregationRepository.java
index 7642c2e31ea..73cdb91ea63 100644
--- a/components/camel-infinispan/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteAggregationRepository.java
+++ b/components/camel-infinispan/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteAggregationRepository.java
@@ -26,6 +26,7 @@ import org.apache.camel.util.function.Suppliers;
import org.infinispan.client.hotrod.Flag;
import org.infinispan.client.hotrod.configuration.ConfigurationBuilder;
import org.infinispan.commons.api.BasicCache;
+import org.infinispan.commons.configuration.Combine;
public class InfinispanRemoteAggregationRepository extends InfinispanAggregationRepository {
private final Supplier<BasicCache<String, DefaultExchangeHolder>> cache;
@@ -62,7 +63,7 @@ public class InfinispanRemoteAggregationRepository extends InfinispanAggregation
} else {
conf.setCacheContainerConfiguration(
new ConfigurationBuilder()
- .read(conf.getCacheContainerConfiguration())
+ .read(conf.getCacheContainerConfiguration(), Combine.DEFAULT)
.addContextInitializer(new DefaultExchangeHolderContextInitializer())
.build());
}
diff --git a/parent/pom.xml b/parent/pom.xml
index 93be2c9ff61..72cbc937229 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -214,7 +214,7 @@
<icu4j-version>73.2</icu4j-version>
<ignite-version>2.15.0</ignite-version>
<impsort-maven-plugin-version>1.9.0</impsort-maven-plugin-version>
- <infinispan-version>14.0.13.Final</infinispan-version>
+ <infinispan-version>14.0.14.Final</infinispan-version>
<influx-java-driver-version>2.23</influx-java-driver-version>
<influx-client-java-driver-version>6.10.0</influx-client-java-driver-version>
<irclib-version>1.10</irclib-version>
diff --git a/test-infra/camel-test-infra-infinispan/src/test/java/org/apache/camel/test/infra/infinispan/services/InfinispanLocalContainerService.java b/test-infra/camel-test-infra-infinispan/src/test/java/org/apache/camel/test/infra/infinispan/services/InfinispanLocalContainerService.java
index 340095db55b..e94bafc5719 100644
--- a/test-infra/camel-test-infra-infinispan/src/test/java/org/apache/camel/test/infra/infinispan/services/InfinispanLocalContainerService.java
+++ b/test-infra/camel-test-infra-infinispan/src/test/java/org/apache/camel/test/infra/infinispan/services/InfinispanLocalContainerService.java
@@ -29,7 +29,7 @@ import org.testcontainers.containers.output.Slf4jLogConsumer;
import org.testcontainers.containers.wait.strategy.Wait;
public class InfinispanLocalContainerService implements InfinispanService, ContainerService<GenericContainer<?>> {
- public static final String CONTAINER_IMAGE = "quay.io/infinispan/server:14.0.13.Final";
+ public static final String CONTAINER_IMAGE = "quay.io/infinispan/server:14.0.14.Final";
public static final String CONTAINER_NAME = "infinispan";
private static final String DEFAULT_USERNAME = "admin";
private static final String DEFAULT_PASSWORD = "password";