diff --git a/pom.xml b/pom.xml index 90a27f0..6157d56 100644 --- a/pom.xml +++ b/pom.xml @@ -148,9 +148,9 @@ 2.18.2 - com.google.code.findbugs - jsr305 - 3.0.2 + jakarta.annotation + jakarta.annotation-api + 2.1.1 junit diff --git a/src/main/java/org/casbin/casdoor/service/PermissionService.java b/src/main/java/org/casbin/casdoor/service/PermissionService.java index 1149a9b..7816298 100644 --- a/src/main/java/org/casbin/casdoor/service/PermissionService.java +++ b/src/main/java/org/casbin/casdoor/service/PermissionService.java @@ -21,7 +21,7 @@ import org.casbin.casdoor.util.Map; import org.casbin.casdoor.util.PermissionOperations; import org.casbin.casdoor.util.http.CasdoorResponse; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import java.io.IOException; import java.util.List; diff --git a/src/main/java/org/casbin/casdoor/service/ProviderService.java b/src/main/java/org/casbin/casdoor/service/ProviderService.java index 4b1dbdf..3f7236f 100644 --- a/src/main/java/org/casbin/casdoor/service/ProviderService.java +++ b/src/main/java/org/casbin/casdoor/service/ProviderService.java @@ -20,7 +20,7 @@ import org.casbin.casdoor.util.Map; import org.casbin.casdoor.util.ProviderOperations; import org.casbin.casdoor.util.http.CasdoorResponse; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import java.io.IOException; import java.util.List; diff --git a/src/main/java/org/casbin/casdoor/service/RecordService.java b/src/main/java/org/casbin/casdoor/service/RecordService.java index 495f293..191a0cd 100644 --- a/src/main/java/org/casbin/casdoor/service/RecordService.java +++ b/src/main/java/org/casbin/casdoor/service/RecordService.java @@ -19,7 +19,7 @@ import org.casbin.casdoor.entity.Record; import org.casbin.casdoor.util.Map; import org.casbin.casdoor.util.http.CasdoorResponse; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import java.io.IOException; import java.util.List; diff --git a/src/main/java/org/casbin/casdoor/service/RoleService.java b/src/main/java/org/casbin/casdoor/service/RoleService.java index 1a805bd..c1f0f33 100644 --- a/src/main/java/org/casbin/casdoor/service/RoleService.java +++ b/src/main/java/org/casbin/casdoor/service/RoleService.java @@ -20,7 +20,7 @@ import org.casbin.casdoor.util.Map; import org.casbin.casdoor.util.RoleOperations; import org.casbin.casdoor.util.http.CasdoorResponse; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import java.io.IOException; import java.util.List; diff --git a/src/main/java/org/casbin/casdoor/service/Service.java b/src/main/java/org/casbin/casdoor/service/Service.java index 9f90263..dc95bd8 100644 --- a/src/main/java/org/casbin/casdoor/service/Service.java +++ b/src/main/java/org/casbin/casdoor/service/Service.java @@ -9,8 +9,8 @@ import org.casbin.casdoor.util.Map; import org.casbin.casdoor.util.http.CasdoorResponse; import org.casbin.casdoor.util.http.HttpClient; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; import java.io.File; import java.io.IOException; diff --git a/src/main/java/org/casbin/casdoor/service/SessionService.java b/src/main/java/org/casbin/casdoor/service/SessionService.java index 01f6f96..d30003e 100644 --- a/src/main/java/org/casbin/casdoor/service/SessionService.java +++ b/src/main/java/org/casbin/casdoor/service/SessionService.java @@ -20,7 +20,7 @@ import org.casbin.casdoor.util.Map; import org.casbin.casdoor.util.SessionOperations; import org.casbin.casdoor.util.http.CasdoorResponse; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import java.io.IOException; import java.util.List; diff --git a/src/main/java/org/casbin/casdoor/util/Map.java b/src/main/java/org/casbin/casdoor/util/Map.java index b1118e4..05979b9 100644 --- a/src/main/java/org/casbin/casdoor/util/Map.java +++ b/src/main/java/org/casbin/casdoor/util/Map.java @@ -1,8 +1,8 @@ package org.casbin.casdoor.util; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; import java.util.HashMap; import java.util.stream.Collectors;