.mvn/extensions.xml

@@ -25,7 +25,7 @@ xsi:schemaLocation="http://maven.apache.org/EXTENSIONS/1.1.0 https://maven.apach
   <extension>
     <groupId>com.gradle</groupId>
     <artifactId>develocity-maven-extension</artifactId>
-    <version>1.21.6</version>
+    <version>1.22</version>
   </extension>
   <extension>
     <groupId>com.gradle</groupId>

pom.xml

@@ -24,7 +24,7 @@
   <artifactId>xwiki-commons</artifactId>
   <name>XWiki Commons - Parent POM</name>
   <packaging>pom</packaging>
-  <version>16.7.0-SNAPSHOT</version>
+  <version>16.8.0-SNAPSHOT</version>
   <description>A collaborative development platform runtime based on the wiki paradigm</description>
   <!-- This special URL automatically finds the correct documentation page or javadoc for the module based on the
        passed maven coordinates (groupid:artifactid:version). Starting with 6.2-milestone-1, the version has been
@@ -46,11 +46,11 @@
   <properties>
     <!-- Define it here because we can't use ${project.version} for plugins and it's useful for
          commons children anyway -->
-    <commons.version>16.7.0-SNAPSHOT</commons.version>
+    <commons.version>16.8.0-SNAPSHOT</commons.version>
 
     <!-- The previous stable version of this project to check against for finding backward incompatibility
          (binary and source). -->
-    <xwiki.compatibility.previous.version>16.6.0</xwiki.compatibility.previous.version>
+    <xwiki.compatibility.previous.version>16.7.0</xwiki.compatibility.previous.version>
 
     <!-- Java -->
     <!-- Note that we prefix the property name by "XWiki", since some code already use the java.version property (such
@@ -75,7 +75,7 @@
     <asm.version>9.7</asm.version>
 
     <!-- Guava -->
-    <guava.version>33.2.1-jre</guava.version>
+    <guava.version>33.3.0-jre</guava.version>
 
     <!-- SLF4J API and implementation -->
     <slf4j.version>2.0.16</slf4j.version>
@@ -88,20 +88,20 @@
 
     <!-- JUnit -->
     <junit.version>4.13.2</junit.version>
-    <junit5.version>5.10.3</junit5.version>
-    <junit.platform.version>1.10.3</junit.platform.version>
+    <junit5.version>5.11.0</junit5.version>
+    <junit.platform.version>1.11.0</junit.platform.version>
     <junit.vintage.version>${junit5.version}</junit.vintage.version>
 
     <!-- Used to keep the surefire and failsafe plugins in sync (to avoid having different behaviors when tests
          are executed with surefire or failsafe) -->
-    <surefire.version>3.3.1</surefire.version>
+    <surefire.version>3.5.0</surefire.version>
 
     <!-- Mock libraries -->
     <jmock.version>2.13.1</jmock.version>
-    <mockito.version>5.12.0</mockito.version>
+    <mockito.version>5.13.0</mockito.version>
 
     <!-- Byte Buddy -->
-    <bytebuddy.version>1.14.18</bytebuddy.version>
+    <bytebuddy.version>1.15.1</bytebuddy.version>
 
     <!-- AspectJ -->
     <aspectj.version>1.9.22.1</aspectj.version>
@@ -111,7 +111,7 @@
     <jacoco.version>0.8.12</jacoco.version>
 
     <!-- Checkstyle -->
-    <checkstyle.version>10.17.0</checkstyle.version>
+    <checkstyle.version>10.18.0</checkstyle.version>
 
     <!-- Spoon -->
     <spoon.version>11.1.0</spoon.version>
@@ -130,7 +130,7 @@
     <maven.archetype.version>3.2.1</maven.archetype.version>
 
     <!-- JAXB -->
-    <jaxb.tools.version>2.0.14</jaxb.tools.version>
+    <jaxb.tools.version>2.0.12</jaxb.tools.version>
 
     <!-- By default, Checkstyle, Backward compatibility check, Enforcer, License plugins, etc., are on -->
     <xwiki.checkstyle.skip>false</xwiki.checkstyle.skip>
@@ -218,8 +218,8 @@
     <maven.resolver.build.version>1.4.1</maven.resolver.build.version>
     <!-- Version of Maven emebedded in XWiki runtime (more recent than the one used during the build to benefit from
          bugfixes and improvements) -->
-    <maven.runtime.version>3.9.8</maven.runtime.version>
-    <maven.resolver.runtime.version>1.9.21</maven.resolver.runtime.version>
+    <maven.runtime.version>3.9.9</maven.runtime.version>
+    <maven.resolver.runtime.version>1.9.22</maven.resolver.runtime.version>
     <!-- Minimum version of the actual Maven binary required to build -->
     <maven.minimum.version>${maven.build.version}</maven.minimum.version>
     <!-- The current Maven version declared in the dependency management (so that it can be changed for the distribution
@@ -250,7 +250,12 @@
     <antlr4.version>4.13.2</antlr4.version>
 
     <!-- Servlet specifications -->
-    <servlet.version>3.1.0</servlet.version>
+    <javax.servlet.version>3.1.0</javax.servlet.version>
+    <jakarta.servlet.version>5.0.0</jakarta.servlet.version>
+
+    <!-- WebSocket specifications -->
+    <javax.websocket.version>1.1</javax.websocket.version>
+    <jakarta.websocket.version>2.1.1</jakarta.websocket.version>
 
     <!-- EL implementation -->
     <!-- Use the same version as the one that comes with the custom XWiki Jetty application server -->
@@ -344,7 +349,7 @@
       <dependency>
         <groupId>org.apache.commons</groupId>
         <artifactId>commons-lang3</artifactId>
-        <version>3.16.0</version>
+        <version>3.17.0</version>
       </dependency>
       <!-- We don't use Commons Lang 2.x ourselves (we use Commons Lang 3.x) but some of our transitive dependencies
            require Commons Lang. The issue is that Maven uses a "closest-to-root" strategy to resolve dependency
@@ -526,7 +531,7 @@
       <dependency>
         <groupId>org.apache.commons</groupId>
         <artifactId>commons-compress</artifactId>
-        <version>1.27.0</version>
+        <version>1.27.1</version>
       </dependency>
       <dependency>
         <groupId>commons-digester</groupId>
@@ -541,7 +546,7 @@
       <dependency>
         <groupId>commons-cli</groupId>
         <artifactId>commons-cli</artifactId>
-        <version>1.8.0</version>
+        <version>1.9.0</version>
       </dependency>
       <dependency>
         <groupId>org.apache.commons</groupId>
@@ -951,6 +956,13 @@
         <version>3.30.2-GA</version>
       </dependency>
 
+      <!-- Injection -->
+      <dependency>
+        <groupId>jakarta.inject</groupId>
+        <artifactId>jakarta.inject-api</artifactId>
+        <version>2.0.1</version>
+      </dependency>
+
       <!-- Triggered by several Maven related projects (Doxia, Maven, Aether) as transitive dependency. We need
            these explicit versions to help Maven decide which version to use. -->
       <dependency>
@@ -1252,15 +1264,31 @@
       <dependency>
         <groupId>javax.servlet</groupId>
         <artifactId>javax.servlet-api</artifactId>
-        <version>${servlet.version}</version>
+        <version>${javax.servlet.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>jakarta.servlet</groupId>
+        <artifactId>jakarta.servlet-api</artifactId>
+        <version>${jakarta.servlet.version}</version>
         <!-- It should always be provided as the API jar is provided by the Servlet Container in which XWiki is
              deployed -->
         <scope>provided</scope>
       </dependency>
       <dependency>
         <groupId>javax.websocket</groupId>
         <artifactId>javax.websocket-api</artifactId>
-        <version>1.1</version>
+        <version>${javax.websocket.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>jakarta.websocket</groupId>
+        <artifactId>jakarta.websocket-api</artifactId>
+        <version>${jakarta.websocket.version}</version>
+        <scope>provided</scope>
+      </dependency>
+      <dependency>
+        <groupId>jakarta.websocket</groupId>
+        <artifactId>jakarta.websocket-client-api</artifactId>
+        <version>${jakarta.websocket.version}</version>
         <scope>provided</scope>
       </dependency>
       <!-- Needed for Legacy modules. The version needs to be in sync with the one used by the AspectJ plugin -->
@@ -1275,6 +1303,7 @@
         <artifactId>cssparser</artifactId>
         <version>0.9.30</version>
       </dependency>
+
       <!-- Bean validation -->
       <dependency>
         <groupId>jakarta.validation</groupId>
@@ -1291,8 +1320,7 @@
         <groupId>org.mortbay.jasper</groupId>
         <artifactId>apache-el</artifactId>
         <version>${apachache-el.version}</version>
-        <!-- The EL implementation is supposed to come with the application server, but we need one for tests -->
-        <scope>test</scope>
+        <scope>runtime</scope>
       </dependency>
 
       <!-- Mail -->
@@ -1421,7 +1449,7 @@
       <dependency>
         <groupId>org.jgroups</groupId>
         <artifactId>jgroups</artifactId>
-        <version>5.3.10.Final</version>
+        <version>5.3.11.Final</version>
       </dependency>
       <!-- Used by Solr and Infinispan -->
       <dependency>
@@ -1437,7 +1465,7 @@
       <dependency>
         <groupId>com.google.errorprone</groupId>
         <artifactId>error_prone_annotations</artifactId>
-        <version>2.30.0</version>
+        <version>2.31.0</version>
       </dependency>
       <!-- The maven remote resource plugin is also used as dependency -->
       <dependency>
@@ -2181,7 +2209,7 @@
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-checkstyle-plugin</artifactId>
           <!-- Lock down plugin version for build reproducibility -->
-          <version>3.4.0</version>
+          <version>3.5.0</version>
           <configuration>
             <consoleOutput>true</consoleOutput>
             <!-- We use this to disable checkstyle when the clover profile is executed since there's a
@@ -2259,7 +2287,7 @@
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-install-plugin</artifactId>
           <!-- Lock down plugin version for build reproducibility -->
-          <version>3.1.2</version>
+          <version>3.1.3</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
@@ -2393,7 +2421,7 @@
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-dependency-plugin</artifactId>
           <!-- Lock down plugin version for build reproducibility -->
-          <version>3.7.1</version>
+          <version>3.8.0</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
@@ -2413,7 +2441,7 @@
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-deploy-plugin</artifactId>
           <!-- Lock down plugin version for build reproducibility -->
-          <version>3.1.2</version>
+          <version>3.1.3</version>
         </plugin>
         <plugin>
           <groupId>org.codehaus.mojo</groupId>
@@ -2444,7 +2472,7 @@
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-invoker-plugin</artifactId>
           <!-- Lock down plugin version for build reproducibility -->
-          <version>3.7.0</version>
+          <version>3.8.0</version>
         </plugin>
         <plugin>
           <groupId>org.codehaus.mojo</groupId>
@@ -2468,7 +2496,7 @@
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-project-info-reports-plugin</artifactId>
           <!-- Lock down plugin version for build reproducibility -->
-          <version>3.6.2</version>
+          <version>3.7.0</version>
         </plugin>
         <!-- Used for checking backward compatibility (binary and source) -->
         <plugin>
@@ -2550,7 +2578,7 @@
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-javadoc-plugin</artifactId>
           <!-- Lock down plugin version for build reproducibility -->
-          <version>3.8.0</version>
+          <version>3.10.0</version>
           <configuration>
             <!-- Always exclude the internal package since it's not user-public -->
             <excludePackageNames>*.internal, *.internal.*</excludePackageNames>
@@ -2570,7 +2598,7 @@
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-site-plugin</artifactId>
           <!-- Lock down plugin version for build reproducibility -->
-          <version>3.12.1</version>
+          <version>3.20.0</version>
         </plugin>
         <plugin>
           <groupId>org.jacoco</groupId>

xwiki-commons-core/pom.xml

@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.xwiki.commons</groupId>
     <artifactId>xwiki-commons-pom</artifactId>
-    <version>16.7.0-SNAPSHOT</version>
+    <version>16.8.0-SNAPSHOT</version>
     <relativePath>../xwiki-commons-pom</relativePath>
   </parent>
   <artifactId>xwiki-commons-core</artifactId>
@@ -64,6 +64,7 @@
     <module>xwiki-commons-websocket</module>
     <module>xwiki-commons-xml</module>
     <module>xwiki-commons-xstream</module>
+    <module>xwiki-commons-jakartabridge</module>
   </modules>
   <build>
     <pluginManagement>
@@ -223,7 +224,75 @@
               </differences>
             </revapi.differences>
             -->
-
+
+            <!-- Jakarta -->
+            <revapi.differences>
+              <justification>False positives</justification>
+              <criticality>allowed</criticality>
+              <differences>
+                <item>
+                  <ignore>true</ignore>
+                  <code>java.class.nonFinalClassInheritsFromNewClass</code>
+                  <old>class org.xwiki.component.embed.GenericProvider&lt;T&gt;</old>
+                  <new>class org.xwiki.component.embed.GenericProvider&lt;T&gt;</new>
+                  <superClass>org.xwiki.component.internal.AbstractGenericProvider&lt;T&gt;</superClass>
+                </item>
+                <item>
+                  <ignore>true</ignore>
+                  <code>java.class.nonFinalClassInheritsFromNewClass</code>
+                  <old>class org.xwiki.component.embed.GenericProvider&lt;T&gt;</old>
+                  <new>class org.xwiki.component.embed.GenericProvider&lt;T&gt;</new>
+                  <superClass>org.xwiki.component.internal.JavaXGenericProvider&lt;T&gt;</superClass>
+                </item>
+              </differences>
+            </revapi.differences>
+            <revapi.differences>
+              <justification>Move to Jakarta WebSocket 2.1.1</justification>
+              <criticality>highlight</criticality>
+              <differences>
+                <item>
+                  <ignore>true</ignore>
+                  <regex>true</regex>
+                  <code>java.class.noLongerImplementsInterface</code>
+                  <interface>javax.websocket..*</interface>
+                </item>
+                <item>
+                  <ignore>true</ignore>
+                  <code>java.method.parameterTypeChanged</code>
+                  <old>parameter &lt;T&gt; T org.xwiki.websocket.WebSocketContext::call(===javax.websocket.Session===, java.util.concurrent.Callable&lt;T&gt;) throws java.lang.Exception</old>
+                  <new>parameter &lt;T&gt; T org.xwiki.websocket.WebSocketContext::call(===jakarta.websocket.Session===, java.util.concurrent.Callable&lt;T&gt;) throws java.lang.Exception</new>
+                  <parameterIndex>0</parameterIndex>
+                </item>
+                <item>
+                  <ignore>true</ignore>
+                  <code>java.method.parameterTypeChanged</code>
+                  <old>parameter void org.xwiki.websocket.WebSocketContext::initialize(===javax.websocket.server.ServerEndpointConfig===, javax.websocket.server.HandshakeRequest, javax.websocket.HandshakeResponse)</old>
+                  <new>parameter void org.xwiki.websocket.WebSocketContext::initialize(===jakarta.websocket.server.ServerEndpointConfig===, jakarta.websocket.server.HandshakeRequest, jakarta.websocket.HandshakeResponse)</new>
+                  <parameterIndex>0</parameterIndex>
+                </item>
+                <item>
+                  <ignore>true</ignore>
+                  <code>java.method.parameterTypeChanged</code>
+                  <old>parameter void org.xwiki.websocket.WebSocketContext::initialize(javax.websocket.server.ServerEndpointConfig, ===javax.websocket.server.HandshakeRequest===, javax.websocket.HandshakeResponse)</old>
+                  <new>parameter void org.xwiki.websocket.WebSocketContext::initialize(jakarta.websocket.server.ServerEndpointConfig, ===jakarta.websocket.server.HandshakeRequest===, jakarta.websocket.HandshakeResponse)</new>
+                  <parameterIndex>1</parameterIndex>
+                </item>
+                <item>
+                  <ignore>true</ignore>
+                  <code>java.method.parameterTypeChanged</code>
+                  <old>parameter void org.xwiki.websocket.WebSocketContext::initialize(javax.websocket.server.ServerEndpointConfig, javax.websocket.server.HandshakeRequest, ===javax.websocket.HandshakeResponse===)</old>
+                  <new>parameter void org.xwiki.websocket.WebSocketContext::initialize(jakarta.websocket.server.ServerEndpointConfig, jakarta.websocket.server.HandshakeRequest, ===jakarta.websocket.HandshakeResponse===)</new>
+                  <parameterIndex>2</parameterIndex>
+                </item>
+                <item>
+                  <ignore>true</ignore>
+                  <code>java.method.parameterTypeChanged</code>
+                  <old>parameter void org.xwiki.websocket.WebSocketContext::run(===javax.websocket.Session===, java.lang.Runnable)</old>
+                  <new>parameter void org.xwiki.websocket.WebSocketContext::run(===jakarta.websocket.Session===, java.lang.Runnable)</new>
+                  <parameterIndex>0</parameterIndex>
+                </item>
+              </differences>
+            </revapi.differences>
           </analysisConfiguration>
         </configuration>
       </plugin>

xwiki-commons-core/xwiki-commons-blame/pom.xml

@@ -24,7 +24,7 @@
   <parent>
     <artifactId>xwiki-commons-core</artifactId>
     <groupId>org.xwiki.commons</groupId>
-    <version>16.7.0-SNAPSHOT</version>
+    <version>16.8.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-commons-blame</artifactId>
   <name>XWiki Commons - Blame</name>