XCOMMONS-3496: Upgrade to Infinispan 15.0.21.Final

Author: tmortagne

pom.xml

@@ -60,10 +60,11 @@
     <!-- The highest Java version officially supported by this version of XWiki -->
     <xwiki.java.version.support>25</xwiki.java.version.support>
 
-    <!-- Jakarta modules -->
+    <!-- Javax/Jakarta modules -->
     <jakarta.mail.version>1.6.8</jakarta.mail.version>
     <jakarta.activation.version>1.2.2</jakarta.activation.version>
-    <jakarta.transaction.version>1.3.3</jakarta.transaction.version>
+    <jakarta.transaction.version>2.0.1</jakarta.transaction.version>
+    <javax.transaction.version>1.3</javax.transaction.version>
     <jakarta.json.version>2.1.3</jakarta.json.version>
     <parsson.version>1.1.7</parsson.version>
     <expressly.version>5.0.0</expressly.version>
@@ -473,12 +474,17 @@
         <groupId>org.apache.commons</groupId>
         <artifactId>commons-dbcp2</artifactId>
         <version>2.13.0</version>
-        <!-- We want to choose the SLF4J binding only when XWiki is packaged. -->
         <exclusions>
+          <!-- We want to choose the SLF4J binding only when XWiki is packaged. -->
           <exclusion>
             <groupId>commons-logging</groupId>
             <artifactId>commons-logging</artifactId>
           </exclusion>
+          <!-- We use javax.transaction:javax.transation-api for JTA 1.3 -->
+          <exclusion>
+            <groupId>jakarta.transaction</groupId>
+            <artifactId>jakarta.transation-api</artifactId>
+          </exclusion>
         </exclusions>
       </dependency>
       <dependency>
@@ -789,6 +795,11 @@
         <artifactId>jakarta.transaction-api</artifactId>
         <version>${jakarta.transaction.version}</version>
       </dependency>
+      <dependency>
+        <groupId>javax.transaction</groupId>
+        <artifactId>javax.transaction-api</artifactId>
+        <version>${javax.transaction.version}</version>
+      </dependency>
 
       <!-- Bouncy Castle -->
       <dependency>
@@ -1487,19 +1498,12 @@
       <dependency>
         <groupId>org.infinispan.protostream</groupId>
         <artifactId>protostream</artifactId>
-        <version>4.6.5.Final</version>
+        <version>5.0.15.Final</version>
       </dependency>
       <dependency>
         <groupId>org.infinispan</groupId>
         <artifactId>infinispan-core</artifactId>
-        <version>14.0.11.Final</version>
-        <exclusions>
-          <!-- We use jakarta.transaction:jakarta.transaction-api (the reference API id) instead in XWiki -->
-          <exclusion>
-            <groupId>org.jboss.spec.javax.transaction</groupId>
-            <artifactId>jboss-transaction-api_1.2_spec</artifactId>
-          </exclusion>
-        </exclusions>
+        <version>15.0.21.Final</version>
       </dependency>
       <dependency>
         <groupId>jakarta.enterprise</groupId>
@@ -2113,11 +2117,10 @@
               <rules>
                 <bannedDependencies>
                   <searchTransitive>true</searchTransitive>
-                  <message>Use jakarta.transaction:jakarta.transaction-api instead</message>
+                  <message>Use javax.transaction:javax.transaction-api instead</message>
                   <excludes>
                     <exclude>javax.transaction:jta</exclude>
                     <exclude>org.jboss.spec.javax.transaction:jboss-transaction-api_1.2_spec</exclude>
-                    <exclude>javax.transaction:javax.transaction-api</exclude>
                   </excludes>
                 </bannedDependencies>
               </rules>

xwiki-commons-core/xwiki-commons-cache/xwiki-commons-cache-infinispan/pom.xml

@@ -50,11 +50,6 @@
       <groupId>org.infinispan</groupId>
       <artifactId>infinispan-core</artifactId>
     </dependency>
-    <!-- Use jakarta.transaction:jakarta.transaction-api instead to not have duplicate JARs in generated WARs -->
-    <dependency>
-      <groupId>jakarta.transaction</groupId>
-      <artifactId>jakarta.transaction-api</artifactId>
-    </dependency>
 
     <!-- Test Dependencies -->
     <dependency>