Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update dependency from javax to jakarta #476

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 11 additions & 5 deletions pom.xml
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/reflections/Reflections.java
Expand Up @@ -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;
Expand Down
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/reflections/scanners/Scanner.java
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/reflections/util/ClasspathHelper.java
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/reflections/util/NameHelper.java
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion 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 {
Expand Down