Skip to content

Commit 7da9dab

Browse files
chengfangchengfang
authored
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)
1 parent 7cf1945 commit 7da9dab

File tree

7 files changed

+41
-23
lines changed

7 files changed

+41
-23
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,4 +29,5 @@ dependency-reduced-pom.xml
2929
# other files to ignore
3030
derby.log
3131
server.lock
32+
target-index
3233

‎pom.xml

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@
5353
<version.org.jboss.marshalling>2.0.12.Final</version.org.jboss.marshalling>
5454
<version.jakarta.batch-api>2.1.1</version.jakarta.batch-api>
5555
<version.jakarta-transaction-api>2.0.0</version.jakarta-transaction-api>
56+
<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>
5657
<version.org.jboss.weld.weld>5.0.0.SP1</version.org.jboss.weld.weld>
5758
<version.org.jboss.weld.weld-se>5.0.0.SP1</version.org.jboss.weld.weld-se>
5859
<version.org.jboss.jandex>2.4.3.Final</version.org.jboss.jandex>
@@ -61,8 +62,8 @@
6162
<version.com.fasterxml.jackson>2.13.2</version.com.fasterxml.jackson>
6263
<version.org.mongodb.mongo-java-driver>3.8.0</version.org.mongodb.mongo-java-driver>
6364

64-
<version.org.infinispan>11.0.3.Final</version.org.infinispan>
65-
<version.org.jgroups>4.2.5.Final</version.org.jgroups>
65+
<version.org.infinispan>13.0.10.Final</version.org.infinispan>
66+
<version.org.jgroups>4.2.21.Final</version.org.jgroups>
6667
<version.org.apache.poi>4.1.2</version.org.apache.poi>
6768
<version.commons-codec>1.10</version.commons-codec>
6869
<version.commons-exec>1.3</version.commons-exec>
@@ -626,13 +627,19 @@
626627
<scope>provided</scope>
627628
</dependency>
628629

629-
<!-- Some tests (e.g., test-apps/amqp) still uses javax.jms -->
630+
<!-- Some tests (e.g., test-apps/amqp) still uses javax.jms and javax.transaction-api -->
630631
<dependency>
631632
<groupId>org.jboss.spec.javax.jms</groupId>
632633
<artifactId>jboss-jms-api_2.0_spec</artifactId>
633634
<version>${version.org.jboss.spec.javax.jms.jboss-jms-api_2.0_spec}</version>
634635
<scope>test</scope>
635636
</dependency>
637+
<dependency>
638+
<groupId>org.jboss.spec.javax.transaction</groupId>
639+
<artifactId>jboss-transaction-api_1.2_spec</artifactId>
640+
<version>${version.org.jboss.spec.javax.transaction.jboss-transaction-api_1.2_spec}</version>
641+
<scope>test</scope>
642+
</dependency>
636643

637644
<dependency>
638645
<groupId>io.netty</groupId>

‎test-apps/infinispanRepositoryFile/src/main/resources/file-infinispan.xml

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,51 +10,56 @@ which is available at https://www.eclipse.org/legal/epl-2.0/
1010
SPDX-License-Identifier: EPL-2.0
1111
-->
1212

13-
<infinispan xmlns="urn:infinispan:config:11.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
14-
xsi:schemaLocation="urn:infinispan:config:11.0 http://infinispan.org/schemas/infinispan-config-11.0.xsd">
13+
<infinispan xmlns="urn:infinispan:config:13.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
14+
xsi:schemaLocation="urn:infinispan:config:13.0 https://infinispan.org/schemas/infinispan-config-13.0.xsd">
1515

1616
<cache-container name="jberet" default-cache="JOB_EXECUTION">
1717
<transport lock-timeout="60000"/>
1818

1919
<serialization marshaller="org.infinispan.commons.marshall.JavaSerializationMarshaller">
20-
<white-list>
20+
<allow-list>
2121
<class>org.jberet.runtime.JobInstanceImpl</class>
2222
<class>org.jberet.runtime.JobExecutionImpl</class>
2323
<class>org.jberet.runtime.StepExecutionImpl</class>
2424
<class>org.jberet.runtime.PartitionExecutionImpl</class>
2525
<class>java.util.concurrent.CopyOnWriteArrayList</class>
26-
</white-list>
26+
</allow-list>
2727
</serialization>
2828

2929
<distributed-cache name="JOB_INSTANCE" mode="ASYNC" l1-lifespan="0">
3030
<persistence>
3131
<file-store path="${jberet.infinispan.file.store:/tmp/jberet.infinispan.file.store}"/>
3232
</persistence>
33+
<indexing enabled="false" />
3334
</distributed-cache>
3435

3536
<distributed-cache name="JOB_EXECUTION" mode="ASYNC" l1-lifespan="0">
3637
<persistence>
3738
<file-store path="${jberet.infinispan.file.store:/tmp/jberet.infinispan.file.store}"/>
3839
</persistence>
40+
<indexing enabled="false" />
3941
</distributed-cache>
4042

4143
<distributed-cache name="STEP_EXECUTION" mode="ASYNC" l1-lifespan="0">
4244
<persistence>
4345
<file-store path="${jberet.infinispan.file.store:/tmp/jberet.infinispan.file.store}"/>
4446
</persistence>
47+
<indexing enabled="false" />
4548
</distributed-cache>
4649

4750
<distributed-cache name="PARTITION_EXECUTION" mode="ASYNC" l1-lifespan="0">
4851
<persistence>
4952
<file-store path="${jberet.infinispan.file.store:/tmp/jberet.infinispan.file.store}"/>
5053
</persistence>
54+
<indexing enabled="false" />
5155
</distributed-cache>
5256

5357
<distributed-cache name="seq" mode="SYNC" l1-lifespan="0">
5458
<transaction mode="BATCH" locking="PESSIMISTIC"/>
5559
<persistence>
5660
<file-store preload="true" fetch-state="true" path="${jberet.infinispan.file.store:/tmp/jberet.infinispan.file.store}"/>
5761
</persistence>
62+
<indexing enabled="false" />
5863
</distributed-cache>
5964
</cache-container>
6065
</infinispan>

‎test-apps/infinispanRepositoryJdbc/src/main/resources/jdbc-infinispan.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,22 +10,22 @@ which is available at https://www.eclipse.org/legal/epl-2.0/
1010
SPDX-License-Identifier: EPL-2.0
1111
-->
1212

13-
<infinispan xmlns="urn:infinispan:config:11.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
14-
xmlns:jdbc="urn:infinispan:config:store:jdbc:11.0"
15-
xsi:schemaLocation="urn:infinispan:config:11.0 http://infinispan.org/schemas/infinispan-config-11.0.xsd
16-
urn:infinispan:config:store:jdbc:11.0 http://infinispan.org/schemas/infinispan-cachestore-jdbc-config-11.0.xsd">
13+
<infinispan xmlns="urn:infinispan:config:13.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
14+
xmlns:jdbc="urn:infinispan:config:store:jdbc:13.0"
15+
xsi:schemaLocation="urn:infinispan:config:13.0 https://infinispan.org/schemas/infinispan-config-13.0.xsd
16+
urn:infinispan:config:store:jdbc:13.0 https://infinispan.org/schemas/infinispan-cachestore-jdbc-config-13.0.xsd">
1717

1818
<cache-container name="jberet" default-cache="JOB_EXECUTION">
1919
<transport lock-timeout="60000"/>
2020

2121
<serialization marshaller="org.infinispan.commons.marshall.JavaSerializationMarshaller">
22-
<white-list>
22+
<allow-list>
2323
<class>org.jberet.runtime.JobInstanceImpl</class>
2424
<class>org.jberet.runtime.JobExecutionImpl</class>
2525
<class>org.jberet.runtime.StepExecutionImpl</class>
2626
<class>org.jberet.runtime.PartitionExecutionImpl</class>
2727
<class>java.util.concurrent.CopyOnWriteArrayList</class>
28-
</white-list>
28+
</allow-list>
2929
</serialization>
3030

3131
<distributed-cache name="JOB_INSTANCE" mode="ASYNC" l1-lifespan="0">

‎test-apps/infinispanRepositoryMem/src/main/resources/mem-infinispan.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,20 +10,20 @@ which is available at https://www.eclipse.org/legal/epl-2.0/
1010
SPDX-License-Identifier: EPL-2.0
1111
-->
1212

13-
<infinispan xmlns="urn:infinispan:config:11.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
14-
xsi:schemaLocation="urn:infinispan:config:11.0 http://infinispan.org/schemas/infinispan-config-11.0.xsd">
13+
<infinispan xmlns="urn:infinispan:config:13.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
14+
xsi:schemaLocation="urn:infinispan:config:13.0 https://infinispan.org/schemas/infinispan-config-13.0.xsd">
1515

1616
<cache-container name="jberet" default-cache="JOB_EXECUTION">
1717
<transport lock-timeout="60000"/>
1818

1919
<serialization marshaller="org.infinispan.commons.marshall.JavaSerializationMarshaller">
20-
<white-list>
20+
<allow-list>
2121
<class>org.jberet.runtime.JobInstanceImpl</class>
2222
<class>org.jberet.runtime.JobExecutionImpl</class>
2323
<class>org.jberet.runtime.StepExecutionImpl</class>
2424
<class>org.jberet.runtime.PartitionExecutionImpl</class>
2525
<class>java.util.concurrent.CopyOnWriteArrayList</class>
26-
</white-list>
26+
</allow-list>
2727
</serialization>
2828

2929
<distributed-cache name="JOB_INSTANCE" mode="ASYNC" l1-lifespan="0">

‎test-apps/infinispanRepositoryRocksDB/src/main/resources/rocksdb-infinispan.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,22 +10,22 @@ which is available at https://www.eclipse.org/legal/epl-2.0/
1010
SPDX-License-Identifier: EPL-2.0
1111
-->
1212

13-
<infinispan xmlns="urn:infinispan:config:11.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
14-
xmlns:rdb="urn:infinispan:config:store:rocksdb:11.0"
15-
xsi:schemaLocation="urn:infinispan:config:11.0 http://infinispan.org/schemas/infinispan-config-11.0.xsd
16-
urn:infinispan:config:store:rocksdb:11.0 http://infinispan.org/schemas/infinispan-cachestore-rocksdb-config-11.0.xsd">
13+
<infinispan xmlns="urn:infinispan:config:13.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
14+
xmlns:rdb="urn:infinispan:config:store:rocksdb:13.0"
15+
xsi:schemaLocation="urn:infinispan:config:13.0 https://infinispan.org/schemas/infinispan-config-13.0.xsd
16+
urn:infinispan:config:store:rocksdb:13.0 https://infinispan.org/schemas/infinispan-cachestore-rocksdb-config-13.0.xsd">
1717

1818
<cache-container name="jberet" default-cache="JOB_EXECUTION">
1919
<transport lock-timeout="60000"/>
2020

2121
<serialization marshaller="org.infinispan.commons.marshall.JavaSerializationMarshaller">
22-
<white-list>
22+
<allow-list>
2323
<class>org.jberet.runtime.JobInstanceImpl</class>
2424
<class>org.jberet.runtime.JobExecutionImpl</class>
2525
<class>org.jberet.runtime.StepExecutionImpl</class>
2626
<class>org.jberet.runtime.PartitionExecutionImpl</class>
2727
<class>java.util.concurrent.CopyOnWriteArrayList</class>
28-
</white-list>
28+
</allow-list>
2929
</serialization>
3030

3131
<distributed-cache name="JOB_INSTANCE" mode="ASYNC" l1-lifespan="0">

‎test-apps/pom.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,11 @@
8888
<groupId>jakarta.transaction</groupId>
8989
<artifactId>jakarta.transaction-api</artifactId>
9090
</dependency>
91+
<!-- javax.transaction-api is test dependency -->
92+
<dependency>
93+
<groupId>org.jboss.spec.javax.transaction</groupId>
94+
<artifactId>jboss-transaction-api_1.2_spec</artifactId>
95+
</dependency>
9196
<dependency>
9297
<groupId>org.jboss.marshalling</groupId>
9398
<artifactId>jboss-marshalling</artifactId>

0 commit comments

Comments
 (0)