diff --git a/pom.xml b/pom.xml index e6652ac..5feac37 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ org.commonjava service-parent - 2 + 5-SNAPSHOT org.commonjava.indy.service @@ -71,7 +71,7 @@ com.fasterxml.jackson.dataformat jackson-dataformat-yaml - 2.13.3 + 2.16.0 org.apache.commons @@ -109,7 +109,7 @@ - io.quarkus + io.quarkus.platform quarkus-maven-plugin diff --git a/src/main/java/org/commonjava/indy/service/security/common/SecurityBindings.java b/src/main/java/org/commonjava/indy/service/security/common/SecurityBindings.java index 926e959..210605d 100644 --- a/src/main/java/org/commonjava/indy/service/security/common/SecurityBindings.java +++ b/src/main/java/org/commonjava/indy/service/security/common/SecurityBindings.java @@ -15,8 +15,8 @@ */ package org.commonjava.indy.service.security.common; -import javax.enterprise.inject.Alternative; -import javax.inject.Named; +import jakarta.enterprise.inject.Alternative; +import jakarta.inject.Named; import java.util.List; @Alternative diff --git a/src/main/java/org/commonjava/indy/service/security/common/SecurityConfiguration.java b/src/main/java/org/commonjava/indy/service/security/common/SecurityConfiguration.java index bba27f8..90f85b3 100644 --- a/src/main/java/org/commonjava/indy/service/security/common/SecurityConfiguration.java +++ b/src/main/java/org/commonjava/indy/service/security/common/SecurityConfiguration.java @@ -20,7 +20,7 @@ import io.smallrye.config.WithDefault; import io.smallrye.config.WithName; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import java.util.Optional; @Startup diff --git a/src/main/java/org/commonjava/indy/service/security/common/SecurityConstraintProvider.java b/src/main/java/org/commonjava/indy/service/security/common/SecurityConstraintProvider.java index b591c3b..ae546ab 100644 --- a/src/main/java/org/commonjava/indy/service/security/common/SecurityConstraintProvider.java +++ b/src/main/java/org/commonjava/indy/service/security/common/SecurityConstraintProvider.java @@ -20,10 +20,10 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.annotation.PostConstruct; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Produces; -import javax.inject.Inject; +import jakarta.annotation.PostConstruct; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Inject; import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; diff --git a/src/main/java/org/commonjava/indy/service/security/common/SecurityManager.java b/src/main/java/org/commonjava/indy/service/security/common/SecurityManager.java index 4fd208f..0fd0ea9 100644 --- a/src/main/java/org/commonjava/indy/service/security/common/SecurityManager.java +++ b/src/main/java/org/commonjava/indy/service/security/common/SecurityManager.java @@ -20,8 +20,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import java.security.Principal; import java.util.Collections; import java.util.Set; diff --git a/src/main/java/org/commonjava/indy/service/security/jaxrs/SecurityInterceptor.java b/src/main/java/org/commonjava/indy/service/security/jaxrs/SecurityInterceptor.java index ccabeab..060aab5 100644 --- a/src/main/java/org/commonjava/indy/service/security/jaxrs/SecurityInterceptor.java +++ b/src/main/java/org/commonjava/indy/service/security/jaxrs/SecurityInterceptor.java @@ -17,14 +17,14 @@ import org.commonjava.indy.service.security.common.SecurityManager; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerRequestFilter; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriInfo; -import javax.ws.rs.ext.Provider; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerRequestFilter; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriInfo; +import jakarta.ws.rs.ext.Provider; @ApplicationScoped @Provider diff --git a/src/test/java/org/commonjava/indy/service/security/jaxrs/SecurityDisabledTest.java b/src/test/java/org/commonjava/indy/service/security/jaxrs/SecurityDisabledTest.java index bf0e795..6c864ec 100644 --- a/src/test/java/org/commonjava/indy/service/security/jaxrs/SecurityDisabledTest.java +++ b/src/test/java/org/commonjava/indy/service/security/jaxrs/SecurityDisabledTest.java @@ -21,10 +21,10 @@ import org.junit.jupiter.api.Test; import static io.restassured.RestAssured.given; -import static javax.ws.rs.core.Response.Status.CREATED; -import static javax.ws.rs.core.Response.Status.FORBIDDEN; -import static javax.ws.rs.core.Response.Status.NO_CONTENT; -import static javax.ws.rs.core.Response.Status.OK; +import static jakarta.ws.rs.core.Response.Status.CREATED; +import static jakarta.ws.rs.core.Response.Status.FORBIDDEN; +import static jakarta.ws.rs.core.Response.Status.NO_CONTENT; +import static jakarta.ws.rs.core.Response.Status.OK; @QuarkusTest @TestProfile( SecurityDisabledProfile.class ) diff --git a/src/test/java/org/commonjava/indy/service/security/jaxrs/SecurityInResourceTest.java b/src/test/java/org/commonjava/indy/service/security/jaxrs/SecurityInResourceTest.java index 368c256..a09fedf 100644 --- a/src/test/java/org/commonjava/indy/service/security/jaxrs/SecurityInResourceTest.java +++ b/src/test/java/org/commonjava/indy/service/security/jaxrs/SecurityInResourceTest.java @@ -20,10 +20,10 @@ import org.junit.jupiter.api.Test; import static io.restassured.RestAssured.given; -import static javax.ws.rs.core.Response.Status.CREATED; -import static javax.ws.rs.core.Response.Status.FORBIDDEN; -import static javax.ws.rs.core.Response.Status.NO_CONTENT; -import static javax.ws.rs.core.Response.Status.OK; +import static jakarta.ws.rs.core.Response.Status.CREATED; +import static jakarta.ws.rs.core.Response.Status.FORBIDDEN; +import static jakarta.ws.rs.core.Response.Status.NO_CONTENT; +import static jakarta.ws.rs.core.Response.Status.OK; @QuarkusTest public class SecurityInResourceTest diff --git a/src/test/java/org/commonjava/indy/service/security/jaxrs/TestResource.java b/src/test/java/org/commonjava/indy/service/security/jaxrs/TestResource.java index df570e5..b2c130c 100644 --- a/src/test/java/org/commonjava/indy/service/security/jaxrs/TestResource.java +++ b/src/test/java/org/commonjava/indy/service/security/jaxrs/TestResource.java @@ -15,16 +15,16 @@ */ package org.commonjava.indy.service.security.jaxrs; -import javax.enterprise.context.ApplicationScoped; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.core.Response; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.Response; -import static javax.ws.rs.core.Response.Status.CREATED; -import static javax.ws.rs.core.Response.Status.NO_CONTENT; +import static jakarta.ws.rs.core.Response.Status.CREATED; +import static jakarta.ws.rs.core.Response.Status.NO_CONTENT; @Path( "/api" ) @ApplicationScoped