From 7da9dabb963f1fd939f3af96f3cc12e7ec9bb0fd Mon Sep 17 00:00:00 2001
From: Cheng Fang <cfang@redhat.com>
Date: Mon, 25 Jul 2022 10:30:24 -0400
Subject: [PATCH] JBERET-574 Upgrade jgroup from 4.2.5.Final to 4.2.21.Final;
 infinispan from 11.0.3.Final to 13.0.10.Final (#263)

---
 .gitignore                                          |  1 +
 pom.xml                                             | 13 ++++++++++---
 .../src/main/resources/file-infinispan.xml          | 13 +++++++++----
 .../src/main/resources/jdbc-infinispan.xml          | 12 ++++++------
 .../src/main/resources/mem-infinispan.xml           |  8 ++++----
 .../src/main/resources/rocksdb-infinispan.xml       | 12 ++++++------
 test-apps/pom.xml                                   |  5 +++++
 7 files changed, 41 insertions(+), 23 deletions(-)

diff --git a/.gitignore b/.gitignore
index ddfab65d3..f969f4660 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,4 +29,5 @@ dependency-reduced-pom.xml
 # other files to ignore
 derby.log
 server.lock
+target-index
 
diff --git a/pom.xml b/pom.xml
index 9b17aec41..6d46d0684 100644
--- a/pom.xml
+++ b/pom.xml
@@ -53,6 +53,7 @@
         <version.org.jboss.marshalling>2.0.12.Final</version.org.jboss.marshalling>
         <version.jakarta.batch-api>2.1.1</version.jakarta.batch-api>
         <version.jakarta-transaction-api>2.0.0</version.jakarta-transaction-api>
+        <version.org.jboss.spec.javax.transaction.jboss-transaction-api_1.2_spec>1.0.0.Final</version.org.jboss.spec.javax.transaction.jboss-transaction-api_1.2_spec>
         <version.org.jboss.weld.weld>5.0.0.SP1</version.org.jboss.weld.weld>
         <version.org.jboss.weld.weld-se>5.0.0.SP1</version.org.jboss.weld.weld-se>
         <version.org.jboss.jandex>2.4.3.Final</version.org.jboss.jandex>
@@ -61,8 +62,8 @@
         <version.com.fasterxml.jackson>2.13.2</version.com.fasterxml.jackson>
         <version.org.mongodb.mongo-java-driver>3.8.0</version.org.mongodb.mongo-java-driver>
 
-        <version.org.infinispan>11.0.3.Final</version.org.infinispan>
-        <version.org.jgroups>4.2.5.Final</version.org.jgroups>
+        <version.org.infinispan>13.0.10.Final</version.org.infinispan>
+        <version.org.jgroups>4.2.21.Final</version.org.jgroups>
         <version.org.apache.poi>4.1.2</version.org.apache.poi>
         <version.commons-codec>1.10</version.commons-codec>
         <version.commons-exec>1.3</version.commons-exec>
@@ -626,13 +627,19 @@
                 <scope>provided</scope>
             </dependency>
 
-            <!-- Some tests (e.g., test-apps/amqp) still uses javax.jms -->
+            <!-- Some tests (e.g., test-apps/amqp) still uses javax.jms and javax.transaction-api -->
             <dependency>
                 <groupId>org.jboss.spec.javax.jms</groupId>
                 <artifactId>jboss-jms-api_2.0_spec</artifactId>
                 <version>${version.org.jboss.spec.javax.jms.jboss-jms-api_2.0_spec}</version>
                 <scope>test</scope>
             </dependency>
+            <dependency>
+                <groupId>org.jboss.spec.javax.transaction</groupId>
+                <artifactId>jboss-transaction-api_1.2_spec</artifactId>
+                <version>${version.org.jboss.spec.javax.transaction.jboss-transaction-api_1.2_spec}</version>
+                <scope>test</scope>
+            </dependency>
 
             <dependency>
                 <groupId>io.netty</groupId>
diff --git a/test-apps/infinispanRepositoryFile/src/main/resources/file-infinispan.xml b/test-apps/infinispanRepositoryFile/src/main/resources/file-infinispan.xml
index fdf557a2c..f86922180 100644
--- a/test-apps/infinispanRepositoryFile/src/main/resources/file-infinispan.xml
+++ b/test-apps/infinispanRepositoryFile/src/main/resources/file-infinispan.xml
@@ -10,44 +10,48 @@ which is available at https://www.eclipse.org/legal/epl-2.0/
 SPDX-License-Identifier: EPL-2.0
 -->
 
-<infinispan xmlns="urn:infinispan:config:11.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xsi:schemaLocation="urn:infinispan:config:11.0 http://infinispan.org/schemas/infinispan-config-11.0.xsd">
+<infinispan xmlns="urn:infinispan:config:13.0" 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">
 
     <cache-container name="jberet" default-cache="JOB_EXECUTION">
         <transport lock-timeout="60000"/>
 
         <serialization marshaller="org.infinispan.commons.marshall.JavaSerializationMarshaller">
-            <white-list>
+            <allow-list>
                 <class>org.jberet.runtime.JobInstanceImpl</class>
                 <class>org.jberet.runtime.JobExecutionImpl</class>
                 <class>org.jberet.runtime.StepExecutionImpl</class>
                 <class>org.jberet.runtime.PartitionExecutionImpl</class>
                 <class>java.util.concurrent.CopyOnWriteArrayList</class>
-            </white-list>
+            </allow-list>
         </serialization>
 
         <distributed-cache name="JOB_INSTANCE" mode="ASYNC" l1-lifespan="0">
             <persistence>
                 <file-store path="${jberet.infinispan.file.store:/tmp/jberet.infinispan.file.store}"/>
             </persistence>
+            <indexing enabled="false" />
         </distributed-cache>
 
         <distributed-cache name="JOB_EXECUTION" mode="ASYNC" l1-lifespan="0">
             <persistence>
                 <file-store path="${jberet.infinispan.file.store:/tmp/jberet.infinispan.file.store}"/>
             </persistence>
+            <indexing enabled="false" />
         </distributed-cache>
 
         <distributed-cache name="STEP_EXECUTION" mode="ASYNC" l1-lifespan="0">
             <persistence>
                 <file-store path="${jberet.infinispan.file.store:/tmp/jberet.infinispan.file.store}"/>
             </persistence>
+            <indexing enabled="false" />
         </distributed-cache>
 
         <distributed-cache name="PARTITION_EXECUTION" mode="ASYNC" l1-lifespan="0">
             <persistence>
                 <file-store path="${jberet.infinispan.file.store:/tmp/jberet.infinispan.file.store}"/>
             </persistence>
+            <indexing enabled="false" />
         </distributed-cache>
 
         <distributed-cache name="seq" mode="SYNC" l1-lifespan="0">
@@ -55,6 +59,7 @@ SPDX-License-Identifier: EPL-2.0
             <persistence>
                 <file-store preload="true" fetch-state="true" path="${jberet.infinispan.file.store:/tmp/jberet.infinispan.file.store}"/>
             </persistence>
+            <indexing enabled="false" />
         </distributed-cache>
     </cache-container>
 </infinispan>
diff --git a/test-apps/infinispanRepositoryJdbc/src/main/resources/jdbc-infinispan.xml b/test-apps/infinispanRepositoryJdbc/src/main/resources/jdbc-infinispan.xml
index 186f330da..c20221973 100644
--- a/test-apps/infinispanRepositoryJdbc/src/main/resources/jdbc-infinispan.xml
+++ b/test-apps/infinispanRepositoryJdbc/src/main/resources/jdbc-infinispan.xml
@@ -10,22 +10,22 @@ which is available at https://www.eclipse.org/legal/epl-2.0/
 SPDX-License-Identifier: EPL-2.0
 -->
 
-<infinispan xmlns="urn:infinispan:config:11.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xmlns:jdbc="urn:infinispan:config:store:jdbc:11.0"
-            xsi:schemaLocation="urn:infinispan:config:11.0 http://infinispan.org/schemas/infinispan-config-11.0.xsd
-                                urn:infinispan:config:store:jdbc:11.0 http://infinispan.org/schemas/infinispan-cachestore-jdbc-config-11.0.xsd">
+<infinispan xmlns="urn:infinispan:config:13.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xmlns:jdbc="urn:infinispan:config:store:jdbc:13.0"
+            xsi:schemaLocation="urn:infinispan:config:13.0 https://infinispan.org/schemas/infinispan-config-13.0.xsd
+                                urn:infinispan:config:store:jdbc:13.0 https://infinispan.org/schemas/infinispan-cachestore-jdbc-config-13.0.xsd">
 
     <cache-container name="jberet" default-cache="JOB_EXECUTION">
         <transport lock-timeout="60000"/>
 
         <serialization marshaller="org.infinispan.commons.marshall.JavaSerializationMarshaller">
-            <white-list>
+            <allow-list>
                 <class>org.jberet.runtime.JobInstanceImpl</class>
                 <class>org.jberet.runtime.JobExecutionImpl</class>
                 <class>org.jberet.runtime.StepExecutionImpl</class>
                 <class>org.jberet.runtime.PartitionExecutionImpl</class>
                 <class>java.util.concurrent.CopyOnWriteArrayList</class>
-            </white-list>
+            </allow-list>
         </serialization>
 
         <distributed-cache name="JOB_INSTANCE" mode="ASYNC" l1-lifespan="0">
diff --git a/test-apps/infinispanRepositoryMem/src/main/resources/mem-infinispan.xml b/test-apps/infinispanRepositoryMem/src/main/resources/mem-infinispan.xml
index 46c096656..3c6a3180e 100644
--- a/test-apps/infinispanRepositoryMem/src/main/resources/mem-infinispan.xml
+++ b/test-apps/infinispanRepositoryMem/src/main/resources/mem-infinispan.xml
@@ -10,20 +10,20 @@ which is available at https://www.eclipse.org/legal/epl-2.0/
 SPDX-License-Identifier: EPL-2.0
 -->
 
-<infinispan xmlns="urn:infinispan:config:11.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xsi:schemaLocation="urn:infinispan:config:11.0 http://infinispan.org/schemas/infinispan-config-11.0.xsd">
+<infinispan xmlns="urn:infinispan:config:13.0" 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">
 
     <cache-container name="jberet" default-cache="JOB_EXECUTION">
         <transport lock-timeout="60000"/>
 
         <serialization marshaller="org.infinispan.commons.marshall.JavaSerializationMarshaller">
-            <white-list>
+            <allow-list>
                 <class>org.jberet.runtime.JobInstanceImpl</class>
                 <class>org.jberet.runtime.JobExecutionImpl</class>
                 <class>org.jberet.runtime.StepExecutionImpl</class>
                 <class>org.jberet.runtime.PartitionExecutionImpl</class>
                 <class>java.util.concurrent.CopyOnWriteArrayList</class>
-            </white-list>
+            </allow-list>
         </serialization>
 
         <distributed-cache name="JOB_INSTANCE" mode="ASYNC" l1-lifespan="0">
diff --git a/test-apps/infinispanRepositoryRocksDB/src/main/resources/rocksdb-infinispan.xml b/test-apps/infinispanRepositoryRocksDB/src/main/resources/rocksdb-infinispan.xml
index 77c0bc185..af29ee0d1 100644
--- a/test-apps/infinispanRepositoryRocksDB/src/main/resources/rocksdb-infinispan.xml
+++ b/test-apps/infinispanRepositoryRocksDB/src/main/resources/rocksdb-infinispan.xml
@@ -10,22 +10,22 @@ which is available at https://www.eclipse.org/legal/epl-2.0/
 SPDX-License-Identifier: EPL-2.0
 -->
 
-<infinispan xmlns="urn:infinispan:config:11.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xmlns:rdb="urn:infinispan:config:store:rocksdb:11.0"
-            xsi:schemaLocation="urn:infinispan:config:11.0 http://infinispan.org/schemas/infinispan-config-11.0.xsd
-            urn:infinispan:config:store:rocksdb:11.0 http://infinispan.org/schemas/infinispan-cachestore-rocksdb-config-11.0.xsd">
+<infinispan xmlns="urn:infinispan:config:13.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xmlns:rdb="urn:infinispan:config:store:rocksdb:13.0"
+            xsi:schemaLocation="urn:infinispan:config:13.0 https://infinispan.org/schemas/infinispan-config-13.0.xsd
+            urn:infinispan:config:store:rocksdb:13.0 https://infinispan.org/schemas/infinispan-cachestore-rocksdb-config-13.0.xsd">
 
     <cache-container name="jberet" default-cache="JOB_EXECUTION">
         <transport lock-timeout="60000"/>
 
         <serialization marshaller="org.infinispan.commons.marshall.JavaSerializationMarshaller">
-            <white-list>
+            <allow-list>
                 <class>org.jberet.runtime.JobInstanceImpl</class>
                 <class>org.jberet.runtime.JobExecutionImpl</class>
                 <class>org.jberet.runtime.StepExecutionImpl</class>
                 <class>org.jberet.runtime.PartitionExecutionImpl</class>
                 <class>java.util.concurrent.CopyOnWriteArrayList</class>
-            </white-list>
+            </allow-list>
         </serialization>
 
         <distributed-cache name="JOB_INSTANCE" mode="ASYNC" l1-lifespan="0">
diff --git a/test-apps/pom.xml b/test-apps/pom.xml
index 9cb370e8a..b821845f8 100644
--- a/test-apps/pom.xml
+++ b/test-apps/pom.xml
@@ -88,6 +88,11 @@
             <groupId>jakarta.transaction</groupId>
             <artifactId>jakarta.transaction-api</artifactId>
         </dependency>
+        <!-- javax.transaction-api is test dependency -->
+        <dependency>
+            <groupId>org.jboss.spec.javax.transaction</groupId>
+            <artifactId>jboss-transaction-api_1.2_spec</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.jboss.marshalling</groupId>
             <artifactId>jboss-marshalling</artifactId>