pom.xml

@@ -50,7 +50,7 @@
 
     <!-- The previous stable version of this project to check against for finding backward incompatibility
          (binary and source). -->
-    <xwiki.compatibility.previous.version>16.1.0</xwiki.compatibility.previous.version>
+    <xwiki.compatibility.previous.version>16.2.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
@@ -72,10 +72,10 @@
     <bouncycastle.version>1.77</bouncycastle.version>
 
     <!-- ASM -->
-    <asm.version>9.6</asm.version>
+    <asm.version>9.7</asm.version>
 
     <!-- Guava -->
-    <guava.version>33.0.0-jre</guava.version>
+    <guava.version>33.1.0-jre</guava.version>
 
     <!-- SLF4J API and implementation -->
     <slf4j.version>2.0.12</slf4j.version>
@@ -97,34 +97,34 @@
     <surefire.version>3.2.5</surefire.version>
 
     <!-- Mock libraries -->
-    <jmock.version>2.13.0</jmock.version>
+    <jmock.version>2.13.1</jmock.version>
     <mockito.version>5.11.0</mockito.version>
 
     <!-- Byte Buddy -->
-    <bytebuddy.version>1.14.12</bytebuddy.version>
+    <bytebuddy.version>1.14.13</bytebuddy.version>
 
     <!-- AspectJ -->
-    <aspectj.version>1.9.21.2</aspectj.version>
+    <aspectj.version>1.9.22</aspectj.version>
 
     <!-- Clover & Jacoco -->
     <clover.version>4.5.2</clover.version>
     <jacoco.version>0.8.11</jacoco.version>
 
     <!-- Checkstyle -->
-    <checkstyle.version>10.14.1</checkstyle.version>
+    <checkstyle.version>10.14.2</checkstyle.version>
 
     <!-- Spoon -->
     <spoon.version>10.4.2</spoon.version>
 
     <!-- Groovy -->
-    <groovy.version>4.0.19</groovy.version>
+    <groovy.version>4.0.20</groovy.version>
 
     <!-- Ivy -->
     <ivy.version>2.5.2</ivy.version>
 
     <!-- Closure compiler -->
     <closure-compiler.version>v20231112</closure-compiler.version>
-    <closure-compiler-maven-plugin.version>2.28.0</closure-compiler-maven-plugin.version>
+    <closure-compiler-maven-plugin.version>2.30.0</closure-compiler-maven-plugin.version>
 
     <!-- Maven Archetype -->
     <maven.archetype.version>3.2.1</maven.archetype.version>
@@ -250,7 +250,8 @@
     <antlr4.version>4.13.1</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>
 
     <!-- EL implementation -->
     <!-- Use the same version as the one that comes with the custom XWiki Jetty application server -->
@@ -370,7 +371,7 @@
       <dependency>
         <groupId>commons-io</groupId>
         <artifactId>commons-io</artifactId>
-        <version>2.15.1</version>
+        <version>2.16.0</version>
       </dependency>
       <dependency>
         <groupId>org.apache.commons</groupId>
@@ -514,7 +515,7 @@
       <dependency>
         <groupId>org.apache.commons</groupId>
         <artifactId>commons-configuration2</artifactId>
-        <version>2.10.0</version>
+        <version>2.10.1</version>
         <!-- We want to choose the SLF4J binding only when XWiki is packaged. -->
         <exclusions>
           <exclusion>
@@ -613,7 +614,7 @@
       <dependency>
         <groupId>com.fasterxml.woodstox</groupId>
         <artifactId>woodstox-core</artifactId>
-        <version>6.6.1</version>
+        <version>6.6.2</version>
       </dependency>
       <dependency>
         <groupId>jaxen</groupId>
@@ -952,6 +953,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>
@@ -987,7 +995,7 @@
       <dependency>
         <groupId>org.codehaus.plexus</groupId>
         <artifactId>plexus-archiver</artifactId>
-        <version>4.9.1</version>
+        <version>4.9.2</version>
       </dependency>
       <dependency>
         <groupId>org.codehaus.plexus</groupId>
@@ -1231,7 +1239,7 @@
       <dependency>
         <groupId>org.wiremock</groupId>
         <artifactId>wiremock-standalone</artifactId>
-        <version>3.4.2</version>
+        <version>3.5.1</version>
       </dependency>
       <dependency>
         <groupId>org.objenesis</groupId>
@@ -1253,7 +1261,12 @@
       <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>
@@ -2547,7 +2560,7 @@
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-gpg-plugin</artifactId>
           <!-- Lock down plugin version for build reproducibility -->
-          <version>3.2.0</version>
+          <version>3.2.2</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>

xwiki-commons-core/pom.xml

@@ -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>
@@ -256,6 +257,27 @@
                 </item>
               </differences>
             </revapi.differences>
+
+            <revapi.differences>
+              <justification>False positives</justification>
+              <criticality>highlight</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>
           </analysisConfiguration>
         </configuration>
       </plugin>

xwiki-commons-core/xwiki-commons-component/xwiki-commons-component-api/pom.xml

@@ -55,13 +55,17 @@
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
     </dependency>
-    <!-- We add this dependency here so that users of the Component API just need to depend on this artifact and
-         don't have to explicitly add a dependency on javax.inject:java.inject. -->
+    <dependency>
+      <groupId>jakarta.inject</groupId>
+      <artifactId>jakarta.inject-api</artifactId>
+    </dependency>
+    <!-- Keep supporting both the Jakarta and Javax injection APIs -->
     <dependency>
       <groupId>javax.inject</groupId>
       <artifactId>javax.inject</artifactId>
       <version>1</version>
     </dependency>
+
     <!-- Testing dependencies -->
     <dependency>
       <groupId>org.xwiki.commons</groupId>

xwiki-commons-core/xwiki-commons-component/xwiki-commons-component-api/src/main/java/org/xwiki/component/descriptor/DefaultComponentDependency.java

@@ -26,13 +26,14 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
-
-import javax.inject.Provider;
+import java.util.Set;
 
 import org.apache.commons.lang3.builder.HashCodeBuilder;
 import org.xwiki.component.util.DefaultParameterizedType;
 import org.xwiki.component.util.ReflectionUtils;
 
+import jakarta.inject.Provider;
+
 /**
  * Default implementation of {@link ComponentDependency}.
  *
@@ -42,6 +43,9 @@
  */
 public class DefaultComponentDependency<T> extends DefaultComponentRole<T> implements ComponentDependency<T>
 {
+    private static final Set<Class<?>> SPECIAL_ROLES =
+        Set.of(List.class, Collection.class, Map.class, javax.inject.Provider.class, Provider.class);
+
     /**
      * @see #getName()
      */
@@ -115,7 +119,8 @@ public boolean equals(Object object)
     {
         boolean result;
 
-        // See http://www.technofundo.com/tech/java/equalhash.html for the detail of this algorithm.
+        // See http://www.technofundo.com/tech/java/equalhash.html for the detail of
+        // this algorithm.
         if (this == object) {
             result = true;
         } else {
@@ -192,7 +197,7 @@ public Class<T> getRole()
     {
         Class mapping = getMappingType();
 
-        if (mapping == List.class || mapping == Collection.class || mapping == Map.class || mapping == Provider.class) {
+        if (SPECIAL_ROLES.contains(mapping)) {
             return ReflectionUtils.getTypeClass(ReflectionUtils.getLastTypeGenericArgument(getRoleType()));
         } else {
             return mapping;
@@ -204,7 +209,7 @@ public void setRole(Class<T> role)
     {
         Class mapping = getMappingType();
 
-        if (mapping == List.class || mapping == Collection.class || mapping == Map.class || mapping == Provider.class) {
+        if (SPECIAL_ROLES.contains(mapping)) {
             Type ownerType;
             Class<?> rawType;
             if (getRoleType() instanceof ParameterizedType) {

xwiki-commons-core/xwiki-commons-component/xwiki-commons-component-api/src/main/java/org/xwiki/component/internal/multi/AbstractGenericComponentManager.java

@@ -21,12 +21,12 @@
 
 import java.lang.reflect.Type;
 
-import javax.inject.Inject;
-
 import org.xwiki.component.descriptor.ComponentDescriptor;
 import org.xwiki.component.manager.ComponentManager;
 import org.xwiki.component.manager.ComponentRepositoryException;
 
+import jakarta.inject.Inject;
+
 /**
  * Generic implementation that creates Component Manager instances based on the generic notion of a key. This is used
  * for example by the Wiki Component Manager or the User Component Manager which respectively have a key returning the

xwiki-commons-core/xwiki-commons-component/xwiki-commons-component-api/src/main/java/org/xwiki/component/internal/multi/DefaultComponentManagerManager.java

@@ -22,14 +22,14 @@
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
 import org.xwiki.component.annotation.Component;
 import org.xwiki.component.manager.ComponentLookupException;
 import org.xwiki.component.manager.ComponentManager;
 import org.xwiki.component.namespace.NamespaceUtils;
 
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
+
 /**
  * Default implementation of {@link ComponentManagerManager}.
  *

xwiki-commons-core/xwiki-commons-component/xwiki-commons-component-api/src/main/java/org/xwiki/component/internal/namespace/DefaultNamespaceValidator.java

@@ -25,17 +25,17 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Provider;
-import javax.inject.Singleton;
-
 import org.apache.commons.lang3.StringUtils;
 import org.xwiki.component.annotation.Component;
 import org.xwiki.component.manager.ComponentManager;
 import org.xwiki.component.namespace.NamespaceNotAllowedException;
 import org.xwiki.component.namespace.NamespaceValidator;
 
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.inject.Provider;
+import jakarta.inject.Singleton;
+
 /**
  * Default implementation of {@link NamespaceValidator}.
  * 

xwiki-commons-core/xwiki-commons-component/xwiki-commons-component-api/src/test/java/org/xwiki/component/descriptor/DefaultComponentRoleTest.java

@@ -30,7 +30,7 @@
  * @version $Id$
  * @since 3.3M1
  */
-public class DefaultComponentRoleTest
+class DefaultComponentRoleTest
 {
     private interface Role
     {

xwiki-commons-core/xwiki-commons-component/xwiki-commons-component-api/src/test/java/org/xwiki/component/internal/namespace/DefaultNamespaceValidatorTest.java

@@ -34,7 +34,7 @@
  *
  * @version $Id$
  */
-public class DefaultNamespaceValidatorTest
+class DefaultNamespaceValidatorTest
 {
     private DefaultNamespaceValidator validator = new DefaultNamespaceValidator();
 

xwiki-commons-core/xwiki-commons-component/xwiki-commons-component-api/src/test/java/org/xwiki/component/internal/namespace/NamespaceTest.java

@@ -31,7 +31,7 @@
  * 
  * @version $Id$
  */
-public class NamespaceTest
+class NamespaceTest
 {
     @Test
     void equalsAndHashCode()

xwiki-commons-core/xwiki-commons-component/xwiki-commons-component-api/src/test/java/org/xwiki/component/internal/namespace/NamespaceUtilsTest.java

@@ -31,7 +31,7 @@
  *
  * @version $Id$
  */
-public class NamespaceUtilsTest
+class NamespaceUtilsTest
 {
     @Test
     void getPrefix()

xwiki-commons-core/xwiki-commons-component/xwiki-commons-component-api/src/test/java/org/xwiki/component/util/DefaultParameterizedTypeTest.java

@@ -32,7 +32,7 @@
  *
  * @version $Id$
  */
-public class DefaultParameterizedTypeTest
+class DefaultParameterizedTypeTest
 {
     @Test
     void toStringTest()

xwiki-commons-core/xwiki-commons-component/xwiki-commons-component-api/src/test/java/org/xwiki/component/util/ReflectionMethodUtilsTest.java

@@ -30,7 +30,7 @@
  *
  * @version $Id$
  */
-public class ReflectionMethodUtilsTest
+class ReflectionMethodUtilsTest
 {
     @Test
     void testGetMethodParameterAnnotations() throws SecurityException, NoSuchMethodException

xwiki-commons-core/xwiki-commons-component/xwiki-commons-component-api/src/test/java/org/xwiki/component/util/ReflectionUtilsTest.java

@@ -46,7 +46,7 @@
  *
  * @version $Id$
  */
-public class ReflectionUtilsTest
+class ReflectionUtilsTest
 {
     private static interface TestInterfaceSimple
     {

xwiki-commons-core/xwiki-commons-component/xwiki-commons-component-archetype/src/main/resources/archetype-resources/src/main/java/internal/DefaultHelloWorld.java

@@ -22,7 +22,7 @@
 import ${package}.HelloWorld;
 import org.xwiki.component.annotation.Component;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 /**
  * Implementation of a {@code HelloWorld} component.