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:37 UTC

[camel] 03/04: Use latest Infinispan image 14.0.3.Final-1 in test-infra related module

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>