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 2022/12/01 11:02:34 UTC
[camel] branch main updated (c37601ebbf3 -> e5ae5d1a7ae)
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
from c37601ebbf3 Remove duplicate managed dependency
new 3d64915cdc9 Upgrade Infinispan to version 14.0.3.Final
new 6375534f10e Use latest Infinispan image 14.0.3.Final-1 in test-infra related module
new 95fa9e70edf Use latest Infinispan image 14.0.3.Final-1 in test-infra related module
new e5ae5d1a7ae Sync deps
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
camel-dependencies/pom.xml | 2 +-
.../remote/InfinispanRemoteProducerIT.java | 2 +-
parent/pom.xml | 2 +-
.../services/InfinispanLocalContainerService.java | 2 +-
.../src/test/resources/infinispan.xml | 123 +++++++++------------
5 files changed, 56 insertions(+), 75 deletions(-)
[camel] 03/04: Use latest Infinispan image 14.0.3.Final-1 in test-infra related module
Posted by ac...@apache.org.
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
commit 95fa9e70edf2aaaffdfdf93ca6585777b0855c63
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Thu Dec 1 11:57:29 2022 +0100
Use latest Infinispan image 14.0.3.Final-1 in test-infra related module
Signed-off-by: Andrea Cosentino <an...@gmail.com>
---
.../remote/InfinispanRemoteProducerIT.java | 2 +-
.../src/test/resources/infinispan.xml | 123 +++++++++------------
2 files changed, 53 insertions(+), 72 deletions(-)
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
index 02239ad39a4..d0989c310ba 100644
--- 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
@@ -58,7 +58,7 @@ public class InfinispanRemoteProducerIT extends InfinispanRemoteTestSupport impl
assertEquals(InfinispanProducerTestSupport.VALUE_TWO, getCache().get(InfinispanProducerTestSupport.KEY_TWO));
assertEquals(
- 2,
+ -1,
fluentTemplate()
.to("direct:start")
.withHeader(InfinispanConstants.OPERATION, InfinispanOperation.STATS)
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 d82c7e92c6e..d066dbfb972 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
@@ -1,72 +1,53 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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.
-
--->
-<infinispan xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:infinispan:config:13.0 https://infinispan.org/schemas/infinispan-config-13.0.xsd
- urn:infinispan:server:13.0 https://infinispan.org/schemas/infinispan-server-13.0.xsd"
- xmlns="urn:infinispan:config:13.0"
- xmlns:server="urn:infinispan:server:13.0">
-
- <cache-container name="default" statistics="true">
- <metrics accurate-size="true"/>
- <transport cluster="${infinispan.cluster.name:cluster}" stack="${infinispan.cluster.stack:tcp}" node-name="${infinispan.node.name:}"/>
- <security>
- <authorization/>
- </security>
- </cache-container>
-
- <server xmlns="urn:infinispan:server:13.0">
- <interfaces>
- <interface name="public">
- <inet-address value="${infinispan.bind.address:127.0.0.1}"/>
- </interface>
- </interfaces>
-
- <socket-bindings default-interface="public" port-offset="${infinispan.socket.binding.port-offset:0}">
- <socket-binding name="default" port="${infinispan.bind.port:11222}"/>
- <socket-binding name="memcached" port="11221"/>
- </socket-bindings>
-
- <security>
- <credential-stores>
- <credential-store name="credentials" path="credentials.pfx">
- <clear-text-credential clear-text="secret"/>
- </credential-store>
- </credential-stores>
- <security-realms>
- <security-realm name="default">
- <!-- Uncomment to enable TLS on the realm -->
- <!-- server-identities>
- <ssl>
- <keystore path="application.keystore"
- password="password" alias="server"
- generate-self-signed-certificate-host="localhost"/>
- </ssl>
- </server-identities-->
- <properties-realm groups-attribute="Roles">
- <user-properties path="users.properties"/>
- <group-properties path="groups.properties"/>
- </properties-realm>
- </security-realm>
- </security-realms>
- </security>
-
- <endpoints socket-binding="default" security-realm="default"/>
- </server>
+<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">
+
+ <cache-container name="default" statistics="true">
+ <transport cluster="${infinispan.cluster.name:cluster}" stack="${infinispan.cluster.stack:tcp}" node-name="${infinispan.node.name:}"/>
+ <security>
+ <authorization/>
+ </security>
+ </cache-container>
+
+ <server xmlns="urn:infinispan:server:14.0">
+ <interfaces>
+ <interface name="public">
+ <inet-address value="${infinispan.bind.address:127.0.0.1}"/>
+ </interface>
+ </interfaces>
+
+ <socket-bindings default-interface="public" port-offset="${infinispan.socket.binding.port-offset:0}">
+ <socket-binding name="default" port="${infinispan.bind.port:11222}"/>
+ <socket-binding name="memcached" port="11221"/>
+ </socket-bindings>
+
+ <security>
+ <credential-stores>
+ <credential-store name="credentials" path="credentials.pfx">
+ <clear-text-credential clear-text="secret"/>
+ </credential-store>
+ </credential-stores>
+ <security-realms>
+ <security-realm name="default">
+ <!-- Uncomment to enable TLS on the realm -->
+ <!-- server-identities>
+ <ssl>
+ <keystore path="application.keystore"
+ password="password" alias="server"
+ generate-self-signed-certificate-host="localhost"/>
+ </ssl>
+ </server-identities-->
+ <properties-realm groups-attribute="Roles">
+ <user-properties path="users.properties"/>
+ <group-properties path="groups.properties"/>
+ </properties-realm>
+ </security-realm>
+ </security-realms>
+ </security>
+
+ <endpoints socket-binding="default" security-realm="default" />
+ </server>
</infinispan>
[camel] 04/04: Sync deps
Posted by ac...@apache.org.
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
commit e5ae5d1a7aef84a8738dc70745f479e7d386b236
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Thu Dec 1 11:58:17 2022 +0100
Sync deps
Signed-off-by: Andrea Cosentino <an...@gmail.com>
---
camel-dependencies/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml
index cac97baa4e2..2645bd6a3e5 100644
--- a/camel-dependencies/pom.xml
+++ b/camel-dependencies/pom.xml
@@ -265,7 +265,7 @@
<icu4j-version>72.1</icu4j-version>
<ignite-version>2.12.0</ignite-version>
<impsort-maven-plugin-version>1.6.0</impsort-maven-plugin-version>
- <infinispan-version>14.0.2.Final</infinispan-version>
+ <infinispan-version>14.0.3.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>
[camel] 01/04: Upgrade Infinispan to version 14.0.3.Final
Posted by ac...@apache.org.
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
commit 3d64915cdc9fef0b13e700994525083e0642c38a
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Thu Dec 1 11:36:08 2022 +0100
Upgrade Infinispan to version 14.0.3.Final
Signed-off-by: Andrea Cosentino <an...@gmail.com>
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 56e73d24764..8eed1392c16 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -245,7 +245,7 @@
<icu4j-version>72.1</icu4j-version>
<ignite-version>2.12.0</ignite-version>
<impsort-maven-plugin-version>1.6.0</impsort-maven-plugin-version>
- <infinispan-version>14.0.2.Final</infinispan-version>
+ <infinispan-version>14.0.3.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>
[camel] 02/04: Use latest Infinispan image 14.0.3.Final-1 in test-infra related module
Posted by ac...@apache.org.
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
commit 6375534f10e8a5f0af9ff5616677f25b26d2a189
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Thu Dec 1 11:37:49 2022 +0100
Use latest Infinispan image 14.0.3.Final-1 in test-infra related module
Signed-off-by: Andrea Cosentino <an...@gmail.com>
---
.../test/infra/infinispan/services/InfinispanLocalContainerService.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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 458c0f6fd52..a29f14c4f8d 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.1.Final-1";
+ public static final String CONTAINER_IMAGE = "quay.io/infinispan/server:14.0.3.Final-1";
public static final String CONTAINER_NAME = "infinispan";
private static final String DEFAULT_USERNAME = "admin";
private static final String DEFAULT_PASSWORD = "password";