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 ccac781 CAMEL-17081: Upgrade Infinispan to 13.0.0
ccac781 is described below
commit ccac781ed43c9324b2d4bc69bf9357f50059733b
Author: Federico Mariani <[email protected]>
AuthorDate: Fri Oct 15 15:49:55 2021 +0200
CAMEL-17081: Upgrade Infinispan to 13.0.0
---
camel-dependencies/pom.xml | 2 +-
.../remote/InfinispanRemoteProducerIT.java | 106 ---------------------
parent/pom.xml | 2 +-
.../services/InfinispanLocalContainerService.java | 2 +-
4 files changed, 3 insertions(+), 109 deletions(-)
diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml
index b93e735..096bb14 100644
--- a/camel-dependencies/pom.xml
+++ b/camel-dependencies/pom.xml
@@ -267,7 +267,7 @@
<icu4j-version>69.1</icu4j-version>
<ignite-version>2.10.0</ignite-version>
<impsort-maven-plugin-version>1.6.0</impsort-maven-plugin-version>
- <infinispan-version>12.1.7.Final</infinispan-version>
+ <infinispan-version>13.0.0.Final</infinispan-version>
<influx-guava-version>20.0</influx-guava-version>
<influx-java-driver-version>2.22</influx-java-driver-version>
<irclib-version>1.10</irclib-version>
diff --git
a/components/camel-infinispan/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteProducerIT.java
b/components/camel-infinispan/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteProducerIT.java
deleted file mode 100644
index b318ac5..0000000
---
a/components/camel-infinispan/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteProducerIT.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.infinispan.remote;
-
-import java.util.function.BiFunction;
-
-import org.apache.camel.BindToRegistry;
-import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.infinispan.InfinispanConstants;
-import org.apache.camel.component.infinispan.InfinispanOperation;
-import org.apache.camel.component.infinispan.InfinispanProducerTestSupport;
-import org.infinispan.client.hotrod.ServerStatistics;
-import org.infinispan.commons.api.BasicCache;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.DisabledOnOs;
-import org.junit.jupiter.api.condition.OS;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-@DisabledOnOs(OS.MAC)
-public class InfinispanRemoteProducerIT extends InfinispanRemoteTestSupport
implements InfinispanProducerTestSupport {
-
- @BindToRegistry("mappingFunction")
- public static BiFunction<String, String, String> mappingFunction() {
- return (k, v) -> v + "replay";
- }
-
- @Test
- public void statsOperation() {
- fluentTemplate()
- .to("direct:start")
- .withHeader(InfinispanConstants.KEY,
InfinispanProducerTestSupport.KEY_ONE)
- .withHeader(InfinispanConstants.VALUE,
InfinispanProducerTestSupport.VALUE_ONE)
- .withHeader(InfinispanConstants.OPERATION,
InfinispanOperation.PUT)
- .send();
-
- assertEquals(InfinispanProducerTestSupport.VALUE_ONE,
getCache().get(InfinispanProducerTestSupport.KEY_ONE));
-
- fluentTemplate()
- .to("direct:start")
- .withHeader(InfinispanConstants.KEY,
InfinispanProducerTestSupport.KEY_TWO)
- .withHeader(InfinispanConstants.VALUE,
InfinispanProducerTestSupport.VALUE_TWO)
- .withHeader(InfinispanConstants.OPERATION,
InfinispanOperation.PUT)
- .send();
-
- assertEquals(InfinispanProducerTestSupport.VALUE_TWO,
getCache().get(InfinispanProducerTestSupport.KEY_TWO));
-
- assertEquals(
- 2,
- fluentTemplate()
- .to("direct:start")
- .withHeader(InfinispanConstants.OPERATION,
InfinispanOperation.STATS)
- .request(ServerStatistics.class)
-
.getIntStatistic(ServerStatistics.CURRENT_NR_OF_ENTRIES));
- }
-
- // *****************************
- //
- // *****************************
-
- @BeforeEach
- protected void beforeEach() {
- // cleanup the default test cache before each run
- getCache().clear();
- }
-
- @Override
- public BasicCache<Object, Object> getCache() {
- return super.getCache();
- }
-
- @Override
- public BasicCache<Object, Object> getCache(String name) {
- return super.getCache(name);
- }
-
- @Override
- protected RouteBuilder createRouteBuilder() throws Exception {
- return new RouteBuilder() {
- @Override
- public void configure() {
- from("direct:start")
- .toF("infinispan:%s", getCacheName());
- from("direct:compute")
-
.toF("infinispan:%s?remappingFunction=#mappingFunction", getCacheName());
- from("direct:explicitput")
- .toF("infinispan:%s?operation=PUT&key=a&value=3",
getCacheName());
- }
- };
- }
-}
diff --git a/parent/pom.xml b/parent/pom.xml
index 56b49af..f8faa1a 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -247,7 +247,7 @@
<icu4j-version>69.1</icu4j-version>
<ignite-version>2.10.0</ignite-version>
<impsort-maven-plugin-version>1.6.0</impsort-maven-plugin-version>
- <infinispan-version>12.1.7.Final</infinispan-version>
+ <infinispan-version>13.0.0.Final</infinispan-version>
<influx-java-driver-version>2.22</influx-java-driver-version>
<influx-guava-version>20.0</influx-guava-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 4e57d09..7fa4c0a 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
@@ -28,7 +28,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:12.1.7.Final-1";
+ public static final String CONTAINER_IMAGE =
"quay.io/infinispan/server:13.0.0.Final";
public static final String CONTAINER_NAME = "infinispan";
private static final String DEFAULT_USERNAME = "admin";
private static final String DEFAULT_PASSWORD = "password";
