Update dependency from javax to jakarta

ronmamo · Apr 25, 2024 · 165b3a8 · 165b3a8
1 parent f5514b1
commit 165b3a8
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 11 deletions.
diff --git a/pom.xml b/pom.xml
@@ -87,12 +87,18 @@
         </dependency>
 
         <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <version>2.5</version>
+            <groupId>jakarta.servlet</groupId>
+            <artifactId>jakarta.servlet-api</artifactId>
+            <version>5.0.0</version>
             <scope>provided</scope>
             <optional>true</optional> <!-- case: when no servlet environment -->
         </dependency>
+
+        <dependency>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
+            <version>2.1.1</version>
+        </dependency>
 
         <dependency>
             <groupId>org.jboss</groupId>
@@ -209,10 +215,10 @@
                 </executions>
                 <configuration>
                     <instructions>
-                        <!-- Do not import javax.annotation as we only need these at compile time -->
+                        <!-- Do not import jakarta.annotation as we only need these at compile time -->
                         <Import-Package>
                             org.jboss.vfs.*;resolution:=optional,
-                            !javax.annotation,
+                            !jakarta.annotation,
                             *
                         </Import-Package>
                         <Bundle-SymbolicName>org.reflections</Bundle-SymbolicName>

diff --git a/src/main/java/org/reflections/Reflections.java b/src/main/java/org/reflections/Reflections.java
@@ -16,7 +16,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 import java.io.BufferedInputStream;
 import java.io.DataInputStream;
 import java.io.File;

diff --git a/src/main/java/org/reflections/scanners/MemberUsageScanner.java b/src/main/java/org/reflections/scanners/MemberUsageScanner.java
@@ -17,7 +17,7 @@
 import org.reflections.util.ClasspathHelper;
 import org.reflections.util.JavassistHelper;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;

diff --git a/src/main/java/org/reflections/scanners/Scanner.java b/src/main/java/org/reflections/scanners/Scanner.java
@@ -3,7 +3,7 @@
 import javassist.bytecode.ClassFile;
 import org.reflections.vfs.Vfs;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 import java.util.AbstractMap;
 import java.util.Collection;
 import java.util.Collections;

diff --git a/src/main/java/org/reflections/util/ClasspathHelper.java b/src/main/java/org/reflections/util/ClasspathHelper.java
@@ -2,7 +2,7 @@
 
 import org.reflections.Reflections;
 
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletContext;
 import java.io.File;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;

diff --git a/src/main/java/org/reflections/util/NameHelper.java b/src/main/java/org/reflections/util/NameHelper.java
@@ -2,7 +2,7 @@
 
 import org.reflections.ReflectionsException;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 import java.lang.reflect.AnnotatedElement;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;

diff --git a/src/test/java/org/reflections/MyTestModelStore.java b/src/test/java/org/reflections/MyTestModelStore.java
@@ -1,4 +1,4 @@
-//generated using Reflections JavaCodeSerializer [Sat Sep 04 04:04:04 JST 2021]
+//generated using Reflections JavaCodeSerializer [Wed Apr 24 19:01:55 PDT 2024]
 package org.reflections;
 
 public interface MyTestModelStore {