diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 601df622f2..dccfe8b57e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -72,9 +72,11 @@ jobs: for module in $MODULES do + if [[ "$module" != "messaging/qpid/" && "$module" != "helm/helm-minimum/" && "$module" != "kamelet/" ]] ; then if [[ "${{ steps.files.outputs.all_changed_and_modified_files }}" =~ ("$module") ]] ; then CHANGED=$(echo $CHANGED" "$module) fi + fi done MODULES_ARG="${CHANGED// /,}" diff --git a/cache/caffeine/src/main/java/io/quarkus/ts/cache/caffeine/ApplicationScopeService.java b/cache/caffeine/src/main/java/io/quarkus/ts/cache/caffeine/ApplicationScopeService.java index f4bf8367ac..baf9fbebb3 100644 --- a/cache/caffeine/src/main/java/io/quarkus/ts/cache/caffeine/ApplicationScopeService.java +++ b/cache/caffeine/src/main/java/io/quarkus/ts/cache/caffeine/ApplicationScopeService.java @@ -1,6 +1,6 @@ package io.quarkus.ts.cache.caffeine; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class ApplicationScopeService extends BaseServiceWithCache { diff --git a/cache/caffeine/src/main/java/io/quarkus/ts/cache/caffeine/BlockingWithCacheResource.java b/cache/caffeine/src/main/java/io/quarkus/ts/cache/caffeine/BlockingWithCacheResource.java index c5480f72f0..c8f56a7b99 100644 --- a/cache/caffeine/src/main/java/io/quarkus/ts/cache/caffeine/BlockingWithCacheResource.java +++ b/cache/caffeine/src/main/java/io/quarkus/ts/cache/caffeine/BlockingWithCacheResource.java @@ -1,9 +1,9 @@ package io.quarkus.ts.cache.caffeine; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; import io.quarkus.cache.CacheInvalidate; import io.quarkus.cache.CacheInvalidateAll; diff --git a/cache/caffeine/src/main/java/io/quarkus/ts/cache/caffeine/ReactiveWithCacheResource.java b/cache/caffeine/src/main/java/io/quarkus/ts/cache/caffeine/ReactiveWithCacheResource.java index 6025b63c16..76bb2c9094 100644 --- a/cache/caffeine/src/main/java/io/quarkus/ts/cache/caffeine/ReactiveWithCacheResource.java +++ b/cache/caffeine/src/main/java/io/quarkus/ts/cache/caffeine/ReactiveWithCacheResource.java @@ -1,9 +1,9 @@ package io.quarkus.ts.cache.caffeine; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; import io.quarkus.cache.CacheInvalidate; import io.quarkus.cache.CacheInvalidateAll; diff --git a/cache/caffeine/src/main/java/io/quarkus/ts/cache/caffeine/RequestScopeService.java b/cache/caffeine/src/main/java/io/quarkus/ts/cache/caffeine/RequestScopeService.java index ca1483c544..8e12392b55 100644 --- a/cache/caffeine/src/main/java/io/quarkus/ts/cache/caffeine/RequestScopeService.java +++ b/cache/caffeine/src/main/java/io/quarkus/ts/cache/caffeine/RequestScopeService.java @@ -1,6 +1,6 @@ package io.quarkus.ts.cache.caffeine; -import javax.enterprise.context.RequestScoped; +import jakarta.enterprise.context.RequestScoped; @RequestScoped public class RequestScopeService extends BaseServiceWithCache { diff --git a/cache/caffeine/src/main/java/io/quarkus/ts/cache/caffeine/ServiceWithCacheResource.java b/cache/caffeine/src/main/java/io/quarkus/ts/cache/caffeine/ServiceWithCacheResource.java index 6f60071503..e71870276a 100644 --- a/cache/caffeine/src/main/java/io/quarkus/ts/cache/caffeine/ServiceWithCacheResource.java +++ b/cache/caffeine/src/main/java/io/quarkus/ts/cache/caffeine/ServiceWithCacheResource.java @@ -1,12 +1,12 @@ package io.quarkus.ts.cache.caffeine; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; @Path("/services") public class ServiceWithCacheResource { diff --git a/config/src/main/java/io/quarkus/ts/configmap/api/server/HelloResource.java b/config/src/main/java/io/quarkus/ts/configmap/api/server/HelloResource.java index 9e240b6577..142f00c48d 100644 --- a/config/src/main/java/io/quarkus/ts/configmap/api/server/HelloResource.java +++ b/config/src/main/java/io/quarkus/ts/configmap/api/server/HelloResource.java @@ -1,12 +1,12 @@ package io.quarkus.ts.configmap.api.server; -import javax.ws.rs.DefaultValue; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.DefaultValue; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import org.eclipse.microprofile.config.inject.ConfigProperties; diff --git a/config/src/main/java/io/quarkus/ts/configmap/api/server/secrets/BuiltConfigResource.java b/config/src/main/java/io/quarkus/ts/configmap/api/server/secrets/BuiltConfigResource.java index 23163c1cca..d03ffd0d07 100644 --- a/config/src/main/java/io/quarkus/ts/configmap/api/server/secrets/BuiltConfigResource.java +++ b/config/src/main/java/io/quarkus/ts/configmap/api/server/secrets/BuiltConfigResource.java @@ -1,6 +1,6 @@ package io.quarkus.ts.configmap.api.server.secrets; -import javax.ws.rs.Path; +import jakarta.ws.rs.Path; import io.smallrye.config.SmallRyeConfig; import io.smallrye.config.SmallRyeConfigBuilder; diff --git a/config/src/main/java/io/quarkus/ts/configmap/api/server/secrets/InjectedConfigResource.java b/config/src/main/java/io/quarkus/ts/configmap/api/server/secrets/InjectedConfigResource.java index 7045d265fe..2282264244 100644 --- a/config/src/main/java/io/quarkus/ts/configmap/api/server/secrets/InjectedConfigResource.java +++ b/config/src/main/java/io/quarkus/ts/configmap/api/server/secrets/InjectedConfigResource.java @@ -1,7 +1,7 @@ package io.quarkus.ts.configmap.api.server.secrets; -import javax.inject.Inject; -import javax.ws.rs.Path; +import jakarta.inject.Inject; +import jakarta.ws.rs.Path; import io.smallrye.config.SmallRyeConfig; diff --git a/config/src/main/java/io/quarkus/ts/configmap/api/server/secrets/InjectedProperitesResource.java b/config/src/main/java/io/quarkus/ts/configmap/api/server/secrets/InjectedProperitesResource.java index e63a2c8251..afbab738b1 100644 --- a/config/src/main/java/io/quarkus/ts/configmap/api/server/secrets/InjectedProperitesResource.java +++ b/config/src/main/java/io/quarkus/ts/configmap/api/server/secrets/InjectedProperitesResource.java @@ -1,6 +1,6 @@ package io.quarkus.ts.configmap.api.server.secrets; -import javax.ws.rs.Path; +import jakarta.ws.rs.Path; import org.eclipse.microprofile.config.inject.ConfigProperty; diff --git a/config/src/main/java/io/quarkus/ts/configmap/api/server/secrets/SecretResource.java b/config/src/main/java/io/quarkus/ts/configmap/api/server/secrets/SecretResource.java index ace9fbb49c..ee603acce7 100644 --- a/config/src/main/java/io/quarkus/ts/configmap/api/server/secrets/SecretResource.java +++ b/config/src/main/java/io/quarkus/ts/configmap/api/server/secrets/SecretResource.java @@ -1,11 +1,11 @@ package io.quarkus.ts.configmap.api.server.secrets; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import io.smallrye.config.SecretKeys; diff --git a/config/src/test/java/io/quarkus/ts/configmap/api/server/OpenShiftBaseConfigIT.java b/config/src/test/java/io/quarkus/ts/configmap/api/server/OpenShiftBaseConfigIT.java index f33528331c..98baa1ae00 100644 --- a/config/src/test/java/io/quarkus/ts/configmap/api/server/OpenShiftBaseConfigIT.java +++ b/config/src/test/java/io/quarkus/ts/configmap/api/server/OpenShiftBaseConfigIT.java @@ -8,7 +8,7 @@ import java.nio.file.Paths; import java.util.concurrent.TimeUnit; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.http.HttpStatus; import org.junit.jupiter.api.Test; diff --git a/config/src/test/java/io/quarkus/ts/configmap/api/server/OpenShiftConfigSourcePriorityIT.java b/config/src/test/java/io/quarkus/ts/configmap/api/server/OpenShiftConfigSourcePriorityIT.java index 4348eaa28d..8078ebdaf2 100644 --- a/config/src/test/java/io/quarkus/ts/configmap/api/server/OpenShiftConfigSourcePriorityIT.java +++ b/config/src/test/java/io/quarkus/ts/configmap/api/server/OpenShiftConfigSourcePriorityIT.java @@ -7,7 +7,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.http.HttpStatus; import org.junit.jupiter.api.Test; diff --git a/docker-build/src/main/java/io/quarkus/ts/docker/HelloResource.java b/docker-build/src/main/java/io/quarkus/ts/docker/HelloResource.java index 75f143035e..45266e6dcf 100644 --- a/docker-build/src/main/java/io/quarkus/ts/docker/HelloResource.java +++ b/docker-build/src/main/java/io/quarkus/ts/docker/HelloResource.java @@ -1,10 +1,10 @@ package io.quarkus.ts.docker; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; @Path("/hello") public class HelloResource { diff --git a/external-applications/src/test/java/io/quarkus/ts/external/applications/OpenShiftQuickstartIT.java b/external-applications/src/test/java/io/quarkus/ts/external/applications/OpenShiftQuickstartIT.java index b83595ae7f..34f92abcd3 100644 --- a/external-applications/src/test/java/io/quarkus/ts/external/applications/OpenShiftQuickstartIT.java +++ b/external-applications/src/test/java/io/quarkus/ts/external/applications/OpenShiftQuickstartIT.java @@ -1,9 +1,13 @@ package io.quarkus.ts.external.applications; +import org.junit.jupiter.api.Disabled; + import io.quarkus.test.scenarios.OpenShiftScenario; import io.quarkus.test.scenarios.annotations.DisabledOnNative; import io.quarkus.test.scenarios.annotations.DisabledOnQuarkusSnapshot; +// TODO: enable when Quarkus QuickStarts migrates to Quarkus 3 +@Disabled("Disabled until Quarkus QuickStarts migrates to Quarkus 3") @DisabledOnQuarkusSnapshot(reason = "999-SNAPSHOT is not available in the Maven repositories in OpenShift") @DisabledOnNative(reason = "Native + s2i not supported") @OpenShiftScenario diff --git a/external-applications/src/test/java/io/quarkus/ts/external/applications/OpenShiftTodoDemoIT.java b/external-applications/src/test/java/io/quarkus/ts/external/applications/OpenShiftTodoDemoIT.java index 33a5378cd1..0f86c3febc 100644 --- a/external-applications/src/test/java/io/quarkus/ts/external/applications/OpenShiftTodoDemoIT.java +++ b/external-applications/src/test/java/io/quarkus/ts/external/applications/OpenShiftTodoDemoIT.java @@ -1,9 +1,13 @@ package io.quarkus.ts.external.applications; +import org.junit.jupiter.api.Disabled; + import io.quarkus.test.scenarios.OpenShiftScenario; import io.quarkus.test.scenarios.annotations.DisabledOnNative; import io.quarkus.test.scenarios.annotations.DisabledOnQuarkusSnapshot; +// TODO: enable when Quarkus TODO application migrates to Quarkus 3 +@Disabled("Disabled until TODO application migrates to Quarkus 3") @DisabledOnQuarkusSnapshot(reason = "999-SNAPSHOT is not available in the Maven repositories in OpenShift") @DisabledOnNative(reason = "Native + s2i not supported") @OpenShiftScenario diff --git a/external-applications/src/test/java/io/quarkus/ts/external/applications/OpenShiftWorkshopHeroesIT.java b/external-applications/src/test/java/io/quarkus/ts/external/applications/OpenShiftWorkshopHeroesIT.java index e1f612fffe..ee6f47c4c4 100644 --- a/external-applications/src/test/java/io/quarkus/ts/external/applications/OpenShiftWorkshopHeroesIT.java +++ b/external-applications/src/test/java/io/quarkus/ts/external/applications/OpenShiftWorkshopHeroesIT.java @@ -48,7 +48,7 @@ public class OpenShiftWorkshopHeroesIT { static PostgresqlService database = new PostgresqlService() .withProperty("PGDATA", "/tmp/psql"); - @GitRepositoryQuarkusApplication(repo = "https://github.com/quarkusio/quarkus-workshops.git", branch = "5bb433fb7a2c8d80dda88dac9dcabc50f7494dc3", contextDir = "quarkus-workshop-super-heroes/super-heroes/rest-heroes", mavenArgs = "-Dquarkus.package.type=uber-jar -DskipTests -Dquarkus.platform.group-id=${QUARKUS_PLATFORM_GROUP-ID} -Dquarkus.platform.version=${QUARKUS_VERSION}") + @GitRepositoryQuarkusApplication(repo = "https://github.com/quarkusio/quarkus-workshops.git", branch = "5bb433fb7a2c8d80dda88dac9dcabc50f7494dc3", contextDir = "quarkus-workshop-super-heroes/super-heroes/rest-heroes", mavenArgs = "-Dquarkus.package.type=uber-jar -DskipTests -Dquarkus.platform.group-id=${QUARKUS_PLATFORM_GROUP-ID} -Dquarkus.platform.version=${QUARKUS_PLATFORM_VERSION}") static final RestService app = new RestService() .withProperty("quarkus.http.port", "8080") .withProperty("quarkus.datasource.reactive.url", () -> database.getReactiveUrl()) diff --git a/external-applications/src/test/java/io/quarkus/ts/external/applications/OpenShiftWorkshopVillainsIT.java b/external-applications/src/test/java/io/quarkus/ts/external/applications/OpenShiftWorkshopVillainsIT.java index 91a1221aba..3e5fdf57f1 100644 --- a/external-applications/src/test/java/io/quarkus/ts/external/applications/OpenShiftWorkshopVillainsIT.java +++ b/external-applications/src/test/java/io/quarkus/ts/external/applications/OpenShiftWorkshopVillainsIT.java @@ -24,6 +24,8 @@ import io.quarkus.test.services.GitRepositoryQuarkusApplication; import io.restassured.http.ContentType; +// TODO: enable when Quarkus Workshops migrates to Quarkus 3 +@Disabled("Disabled until Quarkus Workshops migrates to Quarkus 3") @DisabledOnQuarkusSnapshot(reason = "999-SNAPSHOT is not available in the Maven repositories in OpenShift") @DisabledOnNative(reason = "Native + s2i not supported") @OpenShiftScenario @@ -53,7 +55,7 @@ public class OpenShiftWorkshopVillainsIT { .withProperty("POSTGRES_DB", "mydb") .withProperty("PGDATA", "/tmp/psql"); - @GitRepositoryQuarkusApplication(repo = "https://github.com/quarkusio/quarkus-workshops.git", contextDir = "quarkus-workshop-super-heroes/super-heroes/rest-villains", branch = "3d3425a15daacf1c774cb7f5bc24228c4a623256", mavenArgs = "-Dquarkus.package.type=uber-jar -DskipTests -Dquarkus.platform.group-id=${QUARKUS_PLATFORM_GROUP-ID} -Dquarkus.platform.version=${QUARKUS_VERSION}") + @GitRepositoryQuarkusApplication(repo = "https://github.com/quarkusio/quarkus-workshops.git", contextDir = "quarkus-workshop-super-heroes/super-heroes/rest-villains", branch = "3d3425a15daacf1c774cb7f5bc24228c4a623256", mavenArgs = "-Dquarkus.package.type=uber-jar -DskipTests -Dquarkus.platform.group-id=${QUARKUS_PLATFORM_GROUP-ID} -Dquarkus.platform.version=${QUARKUS_PLATFORM_VERSION}") static final RestService app = new RestService() .withProperty("quarkus.http.port", "8080") .withProperty("quarkus.datasource.username", database.getUser()) diff --git a/external-applications/src/test/java/io/quarkus/ts/external/applications/QuickstartIT.java b/external-applications/src/test/java/io/quarkus/ts/external/applications/QuickstartIT.java index 551af3d778..63ba2975ad 100644 --- a/external-applications/src/test/java/io/quarkus/ts/external/applications/QuickstartIT.java +++ b/external-applications/src/test/java/io/quarkus/ts/external/applications/QuickstartIT.java @@ -1,6 +1,7 @@ package io.quarkus.ts.external.applications; import org.apache.http.HttpStatus; +import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.DisabledOnOs; import org.junit.jupiter.api.condition.OS; @@ -9,10 +10,12 @@ import io.quarkus.test.scenarios.QuarkusScenario; import io.quarkus.test.services.GitRepositoryQuarkusApplication; +// TODO: enable when Quarkus QuickStarts migrates to Quarkus 3 +@Disabled("Disabled until Quarkus QuickStarts migrates to Quarkus 3") @QuarkusScenario @DisabledOnOs(value = OS.WINDOWS, disabledReason = "Windows does not support long file paths") public class QuickstartIT { - @GitRepositoryQuarkusApplication(repo = "https://github.com/quarkusio/quarkus-quickstarts.git", contextDir = "getting-started", mavenArgs = "-Dquarkus.platform.group-id=${QUARKUS_PLATFORM_GROUP-ID} -Dquarkus.platform.version=${QUARKUS_VERSION}") + @GitRepositoryQuarkusApplication(repo = "https://github.com/quarkusio/quarkus-quickstarts.git", contextDir = "getting-started", mavenArgs = "-Dquarkus.platform.group-id=${QUARKUS_PLATFORM_GROUP-ID} -Dquarkus.platform.version=${QUARKUS_PLATFORM_VERSION}") static final RestService app = new RestService(); @Test diff --git a/external-applications/src/test/java/io/quarkus/ts/external/applications/TodoDemoIT.java b/external-applications/src/test/java/io/quarkus/ts/external/applications/TodoDemoIT.java index 32dd88d753..bbf3e101fe 100644 --- a/external-applications/src/test/java/io/quarkus/ts/external/applications/TodoDemoIT.java +++ b/external-applications/src/test/java/io/quarkus/ts/external/applications/TodoDemoIT.java @@ -1,6 +1,7 @@ package io.quarkus.ts.external.applications; import org.apache.http.HttpStatus; +import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import io.quarkus.test.bootstrap.RestService; @@ -8,11 +9,13 @@ import io.quarkus.test.scenarios.annotations.DisabledOnNative; import io.quarkus.test.services.GitRepositoryQuarkusApplication; +// TODO: enable when Quarkus TODO application migrates to Quarkus 3 +@Disabled("Disabled until TODO application migrates to Quarkus 3") @DisabledOnNative(reason = "This scenario is using uber-jar, so it's incompatible with Native") @QuarkusScenario public class TodoDemoIT { private static final String TODO_REPO = "https://github.com/quarkusio/todo-demo-app.git"; - private static final String VERSIONS = "-Dquarkus.platform.group-id=${QUARKUS_PLATFORM_GROUP-ID} -Dquarkus.platform.version=${QUARKUS_VERSION} "; + private static final String VERSIONS = "-Dquarkus.platform.group-id=${QUARKUS_PLATFORM_GROUP-ID} -Dquarkus.platform.version=${QUARKUS_PLATFORM_VERSION} "; private static final String DEFAULT_OPTIONS = "-DskipTests=true " + VERSIONS; @GitRepositoryQuarkusApplication(repo = TODO_REPO, mavenArgs = "-Dquarkus.package.type=uber-jar " + DEFAULT_OPTIONS) diff --git a/funqy/knative-events/src/main/java/io/quarkus/ts/funqy/knativeevents/BrokerClient.java b/funqy/knative-events/src/main/java/io/quarkus/ts/funqy/knativeevents/BrokerClient.java index 124cce4325..0330118252 100644 --- a/funqy/knative-events/src/main/java/io/quarkus/ts/funqy/knativeevents/BrokerClient.java +++ b/funqy/knative-events/src/main/java/io/quarkus/ts/funqy/knativeevents/BrokerClient.java @@ -5,14 +5,14 @@ import java.util.UUID; -import javax.enterprise.context.ApplicationScoped; -import javax.ws.rs.Consumes; -import javax.ws.rs.HeaderParam; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MultivaluedHashMap; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.HeaderParam; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MultivaluedHashMap; +import jakarta.ws.rs.core.MultivaluedMap; import org.eclipse.microprofile.rest.client.annotation.ClientHeaderParam; import org.eclipse.microprofile.rest.client.annotation.RegisterClientHeaders; diff --git a/funqy/knative-events/src/main/java/io/quarkus/ts/funqy/knativeevents/FunctionValidationChain.java b/funqy/knative-events/src/main/java/io/quarkus/ts/funqy/knativeevents/FunctionValidationChain.java index f2ea2a55f8..4d17e72680 100644 --- a/funqy/knative-events/src/main/java/io/quarkus/ts/funqy/knativeevents/FunctionValidationChain.java +++ b/funqy/knative-events/src/main/java/io/quarkus/ts/funqy/knativeevents/FunctionValidationChain.java @@ -22,7 +22,7 @@ import java.util.Map; import java.util.Set; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.eclipse.microprofile.config.inject.ConfigProperty; import org.eclipse.microprofile.rest.client.inject.RestClient; diff --git a/funqy/knative-events/src/main/java/io/quarkus/ts/funqy/knativeevents/ValidationResultRepository.java b/funqy/knative-events/src/main/java/io/quarkus/ts/funqy/knativeevents/ValidationResultRepository.java index 3a7527959c..6555f6a800 100644 --- a/funqy/knative-events/src/main/java/io/quarkus/ts/funqy/knativeevents/ValidationResultRepository.java +++ b/funqy/knative-events/src/main/java/io/quarkus/ts/funqy/knativeevents/ValidationResultRepository.java @@ -3,7 +3,7 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; -import javax.inject.Singleton; +import jakarta.inject.Singleton; @Singleton public class ValidationResultRepository { diff --git a/funqy/knative-events/src/main/resources/application.properties b/funqy/knative-events/src/main/resources/application.properties index 646cace10a..6ac47c97fc 100644 --- a/funqy/knative-events/src/main/resources/application.properties +++ b/funqy/knative-events/src/main/resources/application.properties @@ -3,4 +3,4 @@ quarkus.funqy.knative-events.mapping.pong.response-type=pong-type quarkus.funqy.knative-events.mapping.pong.response-source=pong-source quarkus.funqy.knative-events.mapping.pung.trigger=pong-type quarkus.rest-client.broker.url=${BROKER_URL:http://localhost:8080} -quarkus.rest-client.broker.scope=javax.inject.Singleton +quarkus.rest-client.broker.scope=jakarta.inject.Singleton diff --git a/funqy/knative-events/src/test/java/io/quarkus/ts/funqy/knativeevents/ServerlessExtensionOpenShiftFunqyKnEventsIT.java b/funqy/knative-events/src/test/java/io/quarkus/ts/funqy/knativeevents/ServerlessExtensionOpenShiftFunqyKnEventsIT.java index bf4f58a600..25b1eacc37 100644 --- a/funqy/knative-events/src/test/java/io/quarkus/ts/funqy/knativeevents/ServerlessExtensionOpenShiftFunqyKnEventsIT.java +++ b/funqy/knative-events/src/test/java/io/quarkus/ts/funqy/knativeevents/ServerlessExtensionOpenShiftFunqyKnEventsIT.java @@ -17,7 +17,7 @@ import java.util.HashSet; import java.util.Set; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Tag; diff --git a/helm/helm-minimum/src/main/java/io/quarkus/ts/helm/minimum/CustomReadiness.java b/helm/helm-minimum/src/main/java/io/quarkus/ts/helm/minimum/CustomReadiness.java index b328869343..c1ef4ec49f 100644 --- a/helm/helm-minimum/src/main/java/io/quarkus/ts/helm/minimum/CustomReadiness.java +++ b/helm/helm-minimum/src/main/java/io/quarkus/ts/helm/minimum/CustomReadiness.java @@ -1,6 +1,6 @@ package io.quarkus.ts.helm.minimum; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.eclipse.microprofile.health.HealthCheck; import org.eclipse.microprofile.health.HealthCheckResponse; diff --git a/helm/helm-minimum/src/main/java/io/quarkus/ts/helm/minimum/GreetingResource.java b/helm/helm-minimum/src/main/java/io/quarkus/ts/helm/minimum/GreetingResource.java index 4f6877d38f..093810ae24 100644 --- a/helm/helm-minimum/src/main/java/io/quarkus/ts/helm/minimum/GreetingResource.java +++ b/helm/helm-minimum/src/main/java/io/quarkus/ts/helm/minimum/GreetingResource.java @@ -1,9 +1,9 @@ package io.quarkus.ts.helm.minimum; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; @Path("/greeting") public class GreetingResource { diff --git a/helm/helm-minimum/src/test/java/io/quarkus/ts/helm/minimum/OpenShiftHelmSimpleAppIT.java b/helm/helm-minimum/src/test/java/io/quarkus/ts/helm/minimum/OpenShiftHelmSimpleAppIT.java index 23f3df366e..64932c4380 100644 --- a/helm/helm-minimum/src/test/java/io/quarkus/ts/helm/minimum/OpenShiftHelmSimpleAppIT.java +++ b/helm/helm-minimum/src/test/java/io/quarkus/ts/helm/minimum/OpenShiftHelmSimpleAppIT.java @@ -10,7 +10,7 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.http.HttpStatus; import org.jboss.logging.Logger; diff --git a/http/graphql-telemetry/src/test/java/io/quarkus/ts/http/graphql/telemetry/Utils.java b/http/graphql-telemetry/src/test/java/io/quarkus/ts/http/graphql/telemetry/Utils.java index 4201089d10..5a4a0d57e0 100644 --- a/http/graphql-telemetry/src/test/java/io/quarkus/ts/http/graphql/telemetry/Utils.java +++ b/http/graphql-telemetry/src/test/java/io/quarkus/ts/http/graphql/telemetry/Utils.java @@ -2,7 +2,7 @@ import static io.restassured.RestAssured.given; -import javax.json.Json; +import jakarta.json.Json; import io.restassured.response.Response; diff --git a/http/graphql/src/test/java/io/quarkus/ts/http/graphql/Utils.java b/http/graphql/src/test/java/io/quarkus/ts/http/graphql/Utils.java index 75c2fe9183..9a87ec7591 100644 --- a/http/graphql/src/test/java/io/quarkus/ts/http/graphql/Utils.java +++ b/http/graphql/src/test/java/io/quarkus/ts/http/graphql/Utils.java @@ -5,7 +5,7 @@ import java.net.URLEncoder; import java.nio.charset.StandardCharsets; -import javax.json.Json; +import jakarta.json.Json; import io.restassured.response.Response; diff --git a/http/hibernate-validator/src/test/java/io/quarkus/ts/http/hibernate/validator/sources/ClassicResource.java b/http/hibernate-validator/src/test/java/io/quarkus/ts/http/hibernate/validator/sources/ClassicResource.java index 6e193608d0..d86f6f0045 100644 --- a/http/hibernate-validator/src/test/java/io/quarkus/ts/http/hibernate/validator/sources/ClassicResource.java +++ b/http/hibernate-validator/src/test/java/io/quarkus/ts/http/hibernate/validator/sources/ClassicResource.java @@ -1,11 +1,11 @@ package io.quarkus.ts.http.hibernate.validator.sources; -import javax.validation.constraints.Digits; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.validation.constraints.Digits; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; @Path("/classic") public class ClassicResource { diff --git a/http/hibernate-validator/src/test/java/io/quarkus/ts/http/hibernate/validator/sources/ReactiveResource.java b/http/hibernate-validator/src/test/java/io/quarkus/ts/http/hibernate/validator/sources/ReactiveResource.java index 4043d5e314..9ecd3c64fd 100644 --- a/http/hibernate-validator/src/test/java/io/quarkus/ts/http/hibernate/validator/sources/ReactiveResource.java +++ b/http/hibernate-validator/src/test/java/io/quarkus/ts/http/hibernate/validator/sources/ReactiveResource.java @@ -1,13 +1,13 @@ package io.quarkus.ts.http.hibernate.validator.sources; -import javax.validation.Valid; -import javax.validation.constraints.Digits; -import javax.validation.constraints.Size; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.validation.Valid; +import jakarta.validation.constraints.Digits; +import jakarta.validation.constraints.Size; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.jboss.resteasy.reactive.RestPath; diff --git a/http/http-advanced-reactive/src/main/java/io/quarkus/ts/http/advanced/reactive/ClientResource.java b/http/http-advanced-reactive/src/main/java/io/quarkus/ts/http/advanced/reactive/ClientResource.java index 233071d5cd..46c69750a2 100644 --- a/http/http-advanced-reactive/src/main/java/io/quarkus/ts/http/advanced/reactive/ClientResource.java +++ b/http/http-advanced-reactive/src/main/java/io/quarkus/ts/http/advanced/reactive/ClientResource.java @@ -1,9 +1,9 @@ package io.quarkus.ts.http.advanced.reactive; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.core.Response; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.Response; import org.eclipse.microprofile.rest.client.inject.RestClient; diff --git a/http/http-advanced-reactive/src/main/java/io/quarkus/ts/http/advanced/reactive/GrpcResource.java b/http/http-advanced-reactive/src/main/java/io/quarkus/ts/http/advanced/reactive/GrpcResource.java index 1565dc89ae..6816793bac 100644 --- a/http/http-advanced-reactive/src/main/java/io/quarkus/ts/http/advanced/reactive/GrpcResource.java +++ b/http/http-advanced-reactive/src/main/java/io/quarkus/ts/http/advanced/reactive/GrpcResource.java @@ -1,11 +1,11 @@ package io.quarkus.ts.http.advanced.reactive; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import io.quarkus.example.Greeter; import io.quarkus.example.HelloReply; diff --git a/http/http-advanced-reactive/src/main/java/io/quarkus/ts/http/advanced/reactive/HeadersResource.java b/http/http-advanced-reactive/src/main/java/io/quarkus/ts/http/advanced/reactive/HeadersResource.java index b0e7957302..9856464872 100644 --- a/http/http-advanced-reactive/src/main/java/io/quarkus/ts/http/advanced/reactive/HeadersResource.java +++ b/http/http-advanced-reactive/src/main/java/io/quarkus/ts/http/advanced/reactive/HeadersResource.java @@ -1,8 +1,8 @@ package io.quarkus.ts.http.advanced.reactive; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.Response; import io.smallrye.mutiny.Uni; diff --git a/http/http-advanced-reactive/src/main/java/io/quarkus/ts/http/advanced/reactive/HealthClientService.java b/http/http-advanced-reactive/src/main/java/io/quarkus/ts/http/advanced/reactive/HealthClientService.java index 4e7476d0cc..74f5a1b88c 100644 --- a/http/http-advanced-reactive/src/main/java/io/quarkus/ts/http/advanced/reactive/HealthClientService.java +++ b/http/http-advanced-reactive/src/main/java/io/quarkus/ts/http/advanced/reactive/HealthClientService.java @@ -1,8 +1,8 @@ package io.quarkus.ts.http.advanced.reactive; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.Response; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; diff --git a/http/http-advanced-reactive/src/main/java/io/quarkus/ts/http/advanced/reactive/Hello.java b/http/http-advanced-reactive/src/main/java/io/quarkus/ts/http/advanced/reactive/Hello.java index d3d9ffda0f..93c2891c22 100644 --- a/http/http-advanced-reactive/src/main/java/io/quarkus/ts/http/advanced/reactive/Hello.java +++ b/http/http-advanced-reactive/src/main/java/io/quarkus/ts/http/advanced/reactive/Hello.java @@ -1,7 +1,7 @@ package io.quarkus.ts.http.advanced.reactive; -import javax.validation.constraints.Pattern; -import javax.validation.constraints.Size; +import jakarta.validation.constraints.Pattern; +import jakarta.validation.constraints.Size; import io.smallrye.common.constraint.NotNull; diff --git a/http/http-advanced-reactive/src/main/java/io/quarkus/ts/http/advanced/reactive/HelloAllResource.java b/http/http-advanced-reactive/src/main/java/io/quarkus/ts/http/advanced/reactive/HelloAllResource.java index 7f9a4191ce..7648abe860 100644 --- a/http/http-advanced-reactive/src/main/java/io/quarkus/ts/http/advanced/reactive/HelloAllResource.java +++ b/http/http-advanced-reactive/src/main/java/io/quarkus/ts/http/advanced/reactive/HelloAllResource.java @@ -2,12 +2,12 @@ import static io.quarkus.ts.http.advanced.reactive.HelloResource.NAME; -import javax.ws.rs.DefaultValue; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.DefaultValue; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; import io.smallrye.mutiny.Uni; diff --git a/http/http-advanced-reactive/src/main/java/io/quarkus/ts/http/advanced/reactive/HelloResource.java b/http/http-advanced-reactive/src/main/java/io/quarkus/ts/http/advanced/reactive/HelloResource.java index 2550878fd5..c4a264b4f1 100644 --- a/http/http-advanced-reactive/src/main/java/io/quarkus/ts/http/advanced/reactive/HelloResource.java +++ b/http/http-advanced-reactive/src/main/java/io/quarkus/ts/http/advanced/reactive/HelloResource.java @@ -1,11 +1,11 @@ package io.quarkus.ts.http.advanced.reactive; -import javax.ws.rs.DefaultValue; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.DefaultValue; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; import io.smallrye.mutiny.Uni; diff --git a/http/http-advanced-reactive/src/main/java/io/quarkus/ts/http/advanced/reactive/HttpClientVersionResource.java b/http/http-advanced-reactive/src/main/java/io/quarkus/ts/http/advanced/reactive/HttpClientVersionResource.java index 1c5a2a1799..91f64ab4c3 100644 --- a/http/http-advanced-reactive/src/main/java/io/quarkus/ts/http/advanced/reactive/HttpClientVersionResource.java +++ b/http/http-advanced-reactive/src/main/java/io/quarkus/ts/http/advanced/reactive/HttpClientVersionResource.java @@ -1,7 +1,7 @@ package io.quarkus.ts.http.advanced.reactive; -import javax.enterprise.context.ApplicationScoped; -import javax.ws.rs.core.Response; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.ws.rs.core.Response; import io.quarkus.vertx.web.Route; import io.vertx.ext.web.RoutingContext; diff --git a/http/http-advanced-reactive/src/main/java/io/quarkus/ts/http/advanced/reactive/MediaTypeResource.java b/http/http-advanced-reactive/src/main/java/io/quarkus/ts/http/advanced/reactive/MediaTypeResource.java index 85bf167116..80b8b59caf 100644 --- a/http/http-advanced-reactive/src/main/java/io/quarkus/ts/http/advanced/reactive/MediaTypeResource.java +++ b/http/http-advanced-reactive/src/main/java/io/quarkus/ts/http/advanced/reactive/MediaTypeResource.java @@ -1,26 +1,26 @@ package io.quarkus.ts.http.advanced.reactive; import static io.quarkus.ts.http.advanced.reactive.MediaTypeResource.MEDIA_TYPE_PATH; -import static javax.ws.rs.core.HttpHeaders.ACCEPT_ENCODING; -import static javax.ws.rs.core.HttpHeaders.ACCEPT_LANGUAGE; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; -import static javax.ws.rs.core.MediaType.APPLICATION_OCTET_STREAM; -import static javax.ws.rs.core.MediaType.APPLICATION_XML; -import static javax.ws.rs.core.MediaType.MULTIPART_FORM_DATA; -import static javax.ws.rs.core.MediaType.TEXT_HTML; -import static javax.ws.rs.core.MediaType.TEXT_PLAIN; +import static jakarta.ws.rs.core.HttpHeaders.ACCEPT_ENCODING; +import static jakarta.ws.rs.core.HttpHeaders.ACCEPT_LANGUAGE; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_OCTET_STREAM; +import static jakarta.ws.rs.core.MediaType.APPLICATION_XML; +import static jakarta.ws.rs.core.MediaType.MULTIPART_FORM_DATA; +import static jakarta.ws.rs.core.MediaType.TEXT_HTML; +import static jakarta.ws.rs.core.MediaType.TEXT_PLAIN; import java.io.IOException; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerResponseContext; -import javax.ws.rs.container.ContainerResponseFilter; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerResponseContext; +import jakarta.ws.rs.container.ContainerResponseFilter; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.Provider; import io.quarkus.vertx.web.RouteFilter; import io.vertx.ext.web.RoutingContext; diff --git a/http/http-advanced-reactive/src/main/java/io/quarkus/ts/http/advanced/reactive/MediaTypeWrapper.java b/http/http-advanced-reactive/src/main/java/io/quarkus/ts/http/advanced/reactive/MediaTypeWrapper.java index 8202c74d84..03869ff827 100644 --- a/http/http-advanced-reactive/src/main/java/io/quarkus/ts/http/advanced/reactive/MediaTypeWrapper.java +++ b/http/http-advanced-reactive/src/main/java/io/quarkus/ts/http/advanced/reactive/MediaTypeWrapper.java @@ -1,6 +1,6 @@ package io.quarkus.ts.http.advanced.reactive; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import io.quarkus.runtime.annotations.RegisterForReflection; diff --git a/http/http-advanced-reactive/src/main/java/io/quarkus/ts/http/advanced/reactive/MediaTypeWrapperSerializer.java b/http/http-advanced-reactive/src/main/java/io/quarkus/ts/http/advanced/reactive/MediaTypeWrapperSerializer.java index 838e34bae5..6e71a58f7d 100644 --- a/http/http-advanced-reactive/src/main/java/io/quarkus/ts/http/advanced/reactive/MediaTypeWrapperSerializer.java +++ b/http/http-advanced-reactive/src/main/java/io/quarkus/ts/http/advanced/reactive/MediaTypeWrapperSerializer.java @@ -5,11 +5,11 @@ import java.lang.annotation.Annotation; import java.lang.reflect.Type; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.ext.MessageBodyWriter; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.ext.MessageBodyWriter; +import jakarta.ws.rs.ext.Provider; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/http/http-advanced-reactive/src/main/java/io/quarkus/ts/http/advanced/reactive/MultipartResource.java b/http/http-advanced-reactive/src/main/java/io/quarkus/ts/http/advanced/reactive/MultipartResource.java index adfab42ac9..93ae46824c 100644 --- a/http/http-advanced-reactive/src/main/java/io/quarkus/ts/http/advanced/reactive/MultipartResource.java +++ b/http/http-advanced-reactive/src/main/java/io/quarkus/ts/http/advanced/reactive/MultipartResource.java @@ -6,13 +6,13 @@ import java.io.InputStream; import java.nio.charset.StandardCharsets; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.Status; import org.apache.commons.io.IOUtils; import org.jboss.logging.Logger; diff --git a/http/http-advanced-reactive/src/main/java/io/quarkus/ts/http/advanced/reactive/MultipleResponseSerializersResource.java b/http/http-advanced-reactive/src/main/java/io/quarkus/ts/http/advanced/reactive/MultipleResponseSerializersResource.java index 1b596d41a8..4104879fae 100644 --- a/http/http-advanced-reactive/src/main/java/io/quarkus/ts/http/advanced/reactive/MultipleResponseSerializersResource.java +++ b/http/http-advanced-reactive/src/main/java/io/quarkus/ts/http/advanced/reactive/MultipleResponseSerializersResource.java @@ -1,30 +1,30 @@ package io.quarkus.ts.http.advanced.reactive; import static io.quarkus.ts.http.advanced.reactive.MultipleResponseSerializersResource.MULTIPLE_RESPONSE_SERIALIZERS_PATH; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON_TYPE; -import static javax.ws.rs.core.MediaType.APPLICATION_OCTET_STREAM; -import static javax.ws.rs.core.MediaType.APPLICATION_OCTET_STREAM_TYPE; -import static javax.ws.rs.core.MediaType.TEXT_HTML; -import static javax.ws.rs.core.MediaType.TEXT_HTML_TYPE; -import static javax.ws.rs.core.MediaType.TEXT_PLAIN; -import static javax.ws.rs.core.MediaType.TEXT_PLAIN_TYPE; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON_TYPE; +import static jakarta.ws.rs.core.MediaType.APPLICATION_OCTET_STREAM; +import static jakarta.ws.rs.core.MediaType.APPLICATION_OCTET_STREAM_TYPE; +import static jakarta.ws.rs.core.MediaType.TEXT_HTML; +import static jakarta.ws.rs.core.MediaType.TEXT_HTML_TYPE; +import static jakarta.ws.rs.core.MediaType.TEXT_PLAIN; +import static jakarta.ws.rs.core.MediaType.TEXT_PLAIN_TYPE; import java.io.IOException; import java.io.OutputStream; import java.lang.annotation.Annotation; import java.lang.reflect.Type; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.MessageBodyWriter; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.MessageBodyWriter; +import jakarta.ws.rs.ext.Provider; import io.vertx.core.http.HttpServerRequest; diff --git a/http/http-advanced-reactive/src/main/java/io/quarkus/ts/http/advanced/reactive/NinetyNineBottlesOfBeerResource.java b/http/http-advanced-reactive/src/main/java/io/quarkus/ts/http/advanced/reactive/NinetyNineBottlesOfBeerResource.java index 8cfd0d3887..f6c46a790b 100644 --- a/http/http-advanced-reactive/src/main/java/io/quarkus/ts/http/advanced/reactive/NinetyNineBottlesOfBeerResource.java +++ b/http/http-advanced-reactive/src/main/java/io/quarkus/ts/http/advanced/reactive/NinetyNineBottlesOfBeerResource.java @@ -2,12 +2,12 @@ import static io.quarkus.ts.http.advanced.reactive.NinetyNineBottlesOfBeerResource.QUARKUS_PLATFORM_VERSION_LESS_THAN_2_8_3; import static io.quarkus.ts.http.advanced.reactive.NinetyNineBottlesOfBeerResource.QUARKUS_PLATFORM_VERSION_LESS_THAN_2_8_3_VAL; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; import io.quarkus.arc.properties.UnlessBuildProperty; import io.smallrye.mutiny.Uni; diff --git a/http/http-advanced-reactive/src/main/java/io/quarkus/ts/http/advanced/reactive/PathSpecificHeadersResource.java b/http/http-advanced-reactive/src/main/java/io/quarkus/ts/http/advanced/reactive/PathSpecificHeadersResource.java index 666d05b1fa..b7a268df3f 100644 --- a/http/http-advanced-reactive/src/main/java/io/quarkus/ts/http/advanced/reactive/PathSpecificHeadersResource.java +++ b/http/http-advanced-reactive/src/main/java/io/quarkus/ts/http/advanced/reactive/PathSpecificHeadersResource.java @@ -1,8 +1,8 @@ package io.quarkus.ts.http.advanced.reactive; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.Response; import io.smallrye.mutiny.Uni; diff --git a/http/http-advanced-reactive/src/main/java/io/quarkus/ts/http/advanced/reactive/PremierLeagueContainerRequestFilter.java b/http/http-advanced-reactive/src/main/java/io/quarkus/ts/http/advanced/reactive/PremierLeagueContainerRequestFilter.java index 4169a63e79..acca60a598 100644 --- a/http/http-advanced-reactive/src/main/java/io/quarkus/ts/http/advanced/reactive/PremierLeagueContainerRequestFilter.java +++ b/http/http-advanced-reactive/src/main/java/io/quarkus/ts/http/advanced/reactive/PremierLeagueContainerRequestFilter.java @@ -2,14 +2,14 @@ import java.util.Objects; -import javax.enterprise.inject.Instance; -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.Response.Status; -import javax.ws.rs.core.UriInfo; -import javax.ws.rs.ext.Provider; +import jakarta.enterprise.inject.Instance; +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.Response.Status; +import jakarta.ws.rs.core.UriInfo; +import jakarta.ws.rs.ext.Provider; import org.eclipse.microprofile.config.inject.ConfigProperty; diff --git a/http/http-advanced-reactive/src/main/java/io/quarkus/ts/http/advanced/reactive/ReflectionConfiguration.java b/http/http-advanced-reactive/src/main/java/io/quarkus/ts/http/advanced/reactive/ReflectionConfiguration.java index a2e0a99a11..a4e54c56dc 100644 --- a/http/http-advanced-reactive/src/main/java/io/quarkus/ts/http/advanced/reactive/ReflectionConfiguration.java +++ b/http/http-advanced-reactive/src/main/java/io/quarkus/ts/http/advanced/reactive/ReflectionConfiguration.java @@ -2,7 +2,7 @@ import io.quarkus.runtime.annotations.RegisterForReflection; -@RegisterForReflection(classNames = "javax.ws.rs.core.MediaType") +@RegisterForReflection(classNames = "jakarta.ws.rs.core.MediaType") public class ReflectionConfiguration { } diff --git a/http/http-advanced-reactive/src/main/resources/application.properties b/http/http-advanced-reactive/src/main/resources/application.properties index 1ec580cee2..426c1767d9 100644 --- a/http/http-advanced-reactive/src/main/resources/application.properties +++ b/http/http-advanced-reactive/src/main/resources/application.properties @@ -10,16 +10,16 @@ quarkus.http.ssl.certificate.key-store-file=META-INF/resources/server.keystore quarkus.http.ssl.certificate.key-store-password=password # HttpClient config HealthClientService/mp-rest/url=http://localhost:${quarkus.http.port} -HealthClientService/mp-rest/scope=javax.inject.Singleton +HealthClientService/mp-rest/scope=jakarta.inject.Singleton # FollowRedirect not supported QUARKUS-781 # HealthClientService/mp-rest/followRedirects=true HttpVersionClientService/mp-rest/url=https://localhost:${quarkus.http.ssl-port} -HttpVersionClientService/mp-rest/scope=javax.inject.Singleton +HttpVersionClientService/mp-rest/scope=jakarta.inject.Singleton HttpVersionClientService/mp-rest/hostnameVerifier=io.quarkus.restclient.NoopHostnameVerifier HttpVersionClientService/mp-rest/trustStore=classpath:/META-INF/resources/server.truststore HttpVersionClientService/mp-rest/trustStorePassword=password HttpVersionClientServiceAsync/mp-rest/url=https://localhost:${quarkus.http.ssl-port} -HttpVersionClientServiceAsync/mp-rest/scope=javax.inject.Singleton +HttpVersionClientServiceAsync/mp-rest/scope=jakarta.inject.Singleton HttpVersionClientServiceAsync/mp-rest/hostnameVerifier=io.quarkus.restclient.NoopHostnameVerifier HttpVersionClientServiceAsync/mp-rest/trustStore=classpath:/META-INF/resources/server.truststore HttpVersionClientServiceAsync/mp-rest/trustStorePassword=password diff --git a/http/http-advanced-reactive/src/test/java/io/quarkus/ts/http/advanced/reactive/BaseHttpAdvancedReactiveIT.java b/http/http-advanced-reactive/src/test/java/io/quarkus/ts/http/advanced/reactive/BaseHttpAdvancedReactiveIT.java index c5bbab329f..697c92a538 100644 --- a/http/http-advanced-reactive/src/test/java/io/quarkus/ts/http/advanced/reactive/BaseHttpAdvancedReactiveIT.java +++ b/http/http-advanced-reactive/src/test/java/io/quarkus/ts/http/advanced/reactive/BaseHttpAdvancedReactiveIT.java @@ -15,13 +15,13 @@ import static io.quarkus.ts.http.advanced.reactive.MultipleResponseSerializersResource.MULTIPLE_RESPONSE_SERIALIZERS_PATH; import static io.quarkus.ts.http.advanced.reactive.NinetyNineBottlesOfBeerResource.QUARKUS_PLATFORM_VERSION_LESS_THAN_2_8_3; import static io.quarkus.ts.http.advanced.reactive.NinetyNineBottlesOfBeerResource.QUARKUS_PLATFORM_VERSION_LESS_THAN_2_8_3_VAL; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; -import static javax.ws.rs.core.MediaType.APPLICATION_OCTET_STREAM; -import static javax.ws.rs.core.MediaType.APPLICATION_XML; -import static javax.ws.rs.core.MediaType.MULTIPART_FORM_DATA; -import static javax.ws.rs.core.MediaType.TEXT_HTML; -import static javax.ws.rs.core.MediaType.TEXT_PLAIN; -import static javax.ws.rs.core.MediaType.TEXT_XML; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_OCTET_STREAM; +import static jakarta.ws.rs.core.MediaType.APPLICATION_XML; +import static jakarta.ws.rs.core.MediaType.MULTIPART_FORM_DATA; +import static jakarta.ws.rs.core.MediaType.TEXT_HTML; +import static jakarta.ws.rs.core.MediaType.TEXT_PLAIN; +import static jakarta.ws.rs.core.MediaType.TEXT_XML; import static org.apache.http.HttpHeaders.ACCEPT_ENCODING; import static org.apache.http.HttpHeaders.ACCEPT_LANGUAGE; import static org.apache.http.HttpHeaders.CONTENT_TYPE; @@ -44,9 +44,9 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import javax.ws.rs.Path; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.Response; import org.apache.http.HttpStatus; import org.junit.jupiter.api.Assertions; diff --git a/http/http-advanced-reactive/src/test/java/io/quarkus/ts/http/advanced/reactive/clients/HttpVersionClientService.java b/http/http-advanced-reactive/src/test/java/io/quarkus/ts/http/advanced/reactive/clients/HttpVersionClientService.java index aa7d84fcac..0e925c7d07 100644 --- a/http/http-advanced-reactive/src/test/java/io/quarkus/ts/http/advanced/reactive/clients/HttpVersionClientService.java +++ b/http/http-advanced-reactive/src/test/java/io/quarkus/ts/http/advanced/reactive/clients/HttpVersionClientService.java @@ -1,8 +1,8 @@ package io.quarkus.ts.http.advanced.reactive.clients; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.Response; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; diff --git a/http/http-advanced-reactive/src/test/java/io/quarkus/ts/http/advanced/reactive/clients/HttpVersionClientServiceAsync.java b/http/http-advanced-reactive/src/test/java/io/quarkus/ts/http/advanced/reactive/clients/HttpVersionClientServiceAsync.java index 2dde73cbde..26a62d09de 100644 --- a/http/http-advanced-reactive/src/test/java/io/quarkus/ts/http/advanced/reactive/clients/HttpVersionClientServiceAsync.java +++ b/http/http-advanced-reactive/src/test/java/io/quarkus/ts/http/advanced/reactive/clients/HttpVersionClientServiceAsync.java @@ -1,8 +1,8 @@ package io.quarkus.ts.http.advanced.reactive.clients; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.Response; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; diff --git a/http/http-advanced/src/main/java/io/quarkus/ts/http/advanced/ClientResource.java b/http/http-advanced/src/main/java/io/quarkus/ts/http/advanced/ClientResource.java index d62a7b4f4f..f4a3ec61b5 100644 --- a/http/http-advanced/src/main/java/io/quarkus/ts/http/advanced/ClientResource.java +++ b/http/http-advanced/src/main/java/io/quarkus/ts/http/advanced/ClientResource.java @@ -1,9 +1,9 @@ package io.quarkus.ts.http.advanced; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.core.Response; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.Response; import org.eclipse.microprofile.rest.client.inject.RestClient; diff --git a/http/http-advanced/src/main/java/io/quarkus/ts/http/advanced/GrpcResource.java b/http/http-advanced/src/main/java/io/quarkus/ts/http/advanced/GrpcResource.java index 3b2613fbfc..e1d173f572 100644 --- a/http/http-advanced/src/main/java/io/quarkus/ts/http/advanced/GrpcResource.java +++ b/http/http-advanced/src/main/java/io/quarkus/ts/http/advanced/GrpcResource.java @@ -1,11 +1,11 @@ package io.quarkus.ts.http.advanced; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import io.quarkus.example.GreeterGrpc; import io.quarkus.example.HelloRequest; diff --git a/http/http-advanced/src/main/java/io/quarkus/ts/http/advanced/HeadersResource.java b/http/http-advanced/src/main/java/io/quarkus/ts/http/advanced/HeadersResource.java index d3088f2868..64d8aeadda 100644 --- a/http/http-advanced/src/main/java/io/quarkus/ts/http/advanced/HeadersResource.java +++ b/http/http-advanced/src/main/java/io/quarkus/ts/http/advanced/HeadersResource.java @@ -1,8 +1,8 @@ package io.quarkus.ts.http.advanced; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.Response; @Path("/headers") public class HeadersResource { diff --git a/http/http-advanced/src/main/java/io/quarkus/ts/http/advanced/HealthClientService.java b/http/http-advanced/src/main/java/io/quarkus/ts/http/advanced/HealthClientService.java index c4b1b8019a..254d1e78bb 100644 --- a/http/http-advanced/src/main/java/io/quarkus/ts/http/advanced/HealthClientService.java +++ b/http/http-advanced/src/main/java/io/quarkus/ts/http/advanced/HealthClientService.java @@ -1,8 +1,8 @@ package io.quarkus.ts.http.advanced; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.Response; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; diff --git a/http/http-advanced/src/main/java/io/quarkus/ts/http/advanced/Hello.java b/http/http-advanced/src/main/java/io/quarkus/ts/http/advanced/Hello.java index a195796d85..314c9b2952 100644 --- a/http/http-advanced/src/main/java/io/quarkus/ts/http/advanced/Hello.java +++ b/http/http-advanced/src/main/java/io/quarkus/ts/http/advanced/Hello.java @@ -1,7 +1,7 @@ package io.quarkus.ts.http.advanced; -import javax.validation.constraints.Pattern; -import javax.validation.constraints.Size; +import jakarta.validation.constraints.Pattern; +import jakarta.validation.constraints.Size; import io.smallrye.common.constraint.NotNull; diff --git a/http/http-advanced/src/main/java/io/quarkus/ts/http/advanced/HelloResource.java b/http/http-advanced/src/main/java/io/quarkus/ts/http/advanced/HelloResource.java index c97d64a413..e440c7a07a 100644 --- a/http/http-advanced/src/main/java/io/quarkus/ts/http/advanced/HelloResource.java +++ b/http/http-advanced/src/main/java/io/quarkus/ts/http/advanced/HelloResource.java @@ -3,18 +3,18 @@ import java.time.Duration; import java.util.Objects; -import javax.enterprise.event.Event; -import javax.enterprise.event.ObservesAsync; -import javax.inject.Inject; -import javax.ws.rs.DefaultValue; -import javax.ws.rs.GET; -import javax.ws.rs.NotFoundException; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; +import jakarta.enterprise.event.Event; +import jakarta.enterprise.event.ObservesAsync; +import jakarta.inject.Inject; +import jakarta.ws.rs.DefaultValue; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; @Path("/hello") public class HelloResource { diff --git a/http/http-advanced/src/main/java/io/quarkus/ts/http/advanced/HttpClientVersionResource.java b/http/http-advanced/src/main/java/io/quarkus/ts/http/advanced/HttpClientVersionResource.java index cef65820e6..5b93b1a74b 100644 --- a/http/http-advanced/src/main/java/io/quarkus/ts/http/advanced/HttpClientVersionResource.java +++ b/http/http-advanced/src/main/java/io/quarkus/ts/http/advanced/HttpClientVersionResource.java @@ -1,7 +1,7 @@ package io.quarkus.ts.http.advanced; -import javax.enterprise.context.ApplicationScoped; -import javax.ws.rs.core.Response; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.ws.rs.core.Response; import io.quarkus.vertx.web.Route; import io.vertx.ext.web.RoutingContext; diff --git a/http/http-advanced/src/main/java/io/quarkus/ts/http/advanced/LocalCustomContext.java b/http/http-advanced/src/main/java/io/quarkus/ts/http/advanced/LocalCustomContext.java index 79b074d8c7..937c956c75 100644 --- a/http/http-advanced/src/main/java/io/quarkus/ts/http/advanced/LocalCustomContext.java +++ b/http/http-advanced/src/main/java/io/quarkus/ts/http/advanced/LocalCustomContext.java @@ -1,6 +1,6 @@ package io.quarkus.ts.http.advanced; -import javax.enterprise.context.RequestScoped; +import jakarta.enterprise.context.RequestScoped; @RequestScoped public class LocalCustomContext { diff --git a/http/http-advanced/src/main/java/io/quarkus/ts/http/advanced/PathSpecificHeadersResource.java b/http/http-advanced/src/main/java/io/quarkus/ts/http/advanced/PathSpecificHeadersResource.java index d5d03488e1..0be6b3de79 100644 --- a/http/http-advanced/src/main/java/io/quarkus/ts/http/advanced/PathSpecificHeadersResource.java +++ b/http/http-advanced/src/main/java/io/quarkus/ts/http/advanced/PathSpecificHeadersResource.java @@ -1,8 +1,8 @@ package io.quarkus.ts.http.advanced; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.Response; @Path("/filter") public class PathSpecificHeadersResource { diff --git a/http/http-advanced/src/main/java/io/quarkus/ts/http/advanced/PremierLeagueContainerRequestFilter.java b/http/http-advanced/src/main/java/io/quarkus/ts/http/advanced/PremierLeagueContainerRequestFilter.java index 503bd29b07..8080a00f3c 100644 --- a/http/http-advanced/src/main/java/io/quarkus/ts/http/advanced/PremierLeagueContainerRequestFilter.java +++ b/http/http-advanced/src/main/java/io/quarkus/ts/http/advanced/PremierLeagueContainerRequestFilter.java @@ -2,14 +2,14 @@ import java.util.Objects; -import javax.enterprise.inject.Instance; -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.Response.Status; -import javax.ws.rs.core.UriInfo; -import javax.ws.rs.ext.Provider; +import jakarta.enterprise.inject.Instance; +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.Response.Status; +import jakarta.ws.rs.core.UriInfo; +import jakarta.ws.rs.ext.Provider; import org.eclipse.microprofile.config.inject.ConfigProperty; import org.jboss.resteasy.spi.HttpRequest; diff --git a/http/http-advanced/src/main/java/io/quarkus/ts/http/advanced/RequestDetailsResource.java b/http/http-advanced/src/main/java/io/quarkus/ts/http/advanced/RequestDetailsResource.java index f55153981f..fffa129bee 100644 --- a/http/http-advanced/src/main/java/io/quarkus/ts/http/advanced/RequestDetailsResource.java +++ b/http/http-advanced/src/main/java/io/quarkus/ts/http/advanced/RequestDetailsResource.java @@ -1,10 +1,10 @@ package io.quarkus.ts.http.advanced; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import io.vertx.core.http.HttpServerRequest; diff --git a/http/http-advanced/src/main/resources/application.properties b/http/http-advanced/src/main/resources/application.properties index 03931d41d8..c8bc17fddb 100644 --- a/http/http-advanced/src/main/resources/application.properties +++ b/http/http-advanced/src/main/resources/application.properties @@ -10,16 +10,16 @@ quarkus.http.ssl.certificate.key-store-file=META-INF/resources/server.keystore quarkus.http.ssl.certificate.key-store-password=password # HttpClient config HealthClientService/mp-rest/url=http://localhost:${quarkus.http.port} -HealthClientService/mp-rest/scope=javax.inject.Singleton +HealthClientService/mp-rest/scope=jakarta.inject.Singleton # FollowRedirect not supported QUARKUS-781 # HealthClientService/mp-rest/followRedirects=true HttpVersionClientService/mp-rest/url=https://localhost:${quarkus.http.ssl-port} -HttpVersionClientService/mp-rest/scope=javax.inject.Singleton +HttpVersionClientService/mp-rest/scope=jakarta.inject.Singleton HttpVersionClientService/mp-rest/hostnameVerifier=io.quarkus.restclient.NoopHostnameVerifier HttpVersionClientService/mp-rest/trustStore=classpath:/META-INF/resources/server.truststore HttpVersionClientService/mp-rest/trustStorePassword=password HttpVersionClientServiceAsync/mp-rest/url=https://localhost:${quarkus.http.ssl-port} -HttpVersionClientServiceAsync/mp-rest/scope=javax.inject.Singleton +HttpVersionClientServiceAsync/mp-rest/scope=jakarta.inject.Singleton HttpVersionClientServiceAsync/mp-rest/hostnameVerifier=io.quarkus.restclient.NoopHostnameVerifier HttpVersionClientServiceAsync/mp-rest/trustStore=classpath:/META-INF/resources/server.truststore HttpVersionClientServiceAsync/mp-rest/trustStorePassword=password diff --git a/http/http-advanced/src/test/java/io/quarkus/ts/http/advanced/BaseHttpAdvancedIT.java b/http/http-advanced/src/test/java/io/quarkus/ts/http/advanced/BaseHttpAdvancedIT.java index 219e884578..3e2c9cbc0f 100644 --- a/http/http-advanced/src/test/java/io/quarkus/ts/http/advanced/BaseHttpAdvancedIT.java +++ b/http/http-advanced/src/test/java/io/quarkus/ts/http/advanced/BaseHttpAdvancedIT.java @@ -19,7 +19,7 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import org.apache.http.HttpStatus; import org.junit.jupiter.api.Assertions; diff --git a/http/http-advanced/src/test/java/io/quarkus/ts/http/advanced/clients/HttpVersionClientService.java b/http/http-advanced/src/test/java/io/quarkus/ts/http/advanced/clients/HttpVersionClientService.java index 11ce904906..99eda51797 100644 --- a/http/http-advanced/src/test/java/io/quarkus/ts/http/advanced/clients/HttpVersionClientService.java +++ b/http/http-advanced/src/test/java/io/quarkus/ts/http/advanced/clients/HttpVersionClientService.java @@ -1,8 +1,8 @@ package io.quarkus.ts.http.advanced.clients; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.Response; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; diff --git a/http/http-advanced/src/test/java/io/quarkus/ts/http/advanced/clients/HttpVersionClientServiceAsync.java b/http/http-advanced/src/test/java/io/quarkus/ts/http/advanced/clients/HttpVersionClientServiceAsync.java index b333553062..2ace750af3 100644 --- a/http/http-advanced/src/test/java/io/quarkus/ts/http/advanced/clients/HttpVersionClientServiceAsync.java +++ b/http/http-advanced/src/test/java/io/quarkus/ts/http/advanced/clients/HttpVersionClientServiceAsync.java @@ -1,8 +1,8 @@ package io.quarkus.ts.http.advanced.clients; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.Response; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; diff --git a/http/http-minimum-reactive/src/main/java/io/quarkus/ts/http/minimum/reactive/ClusterResource.java b/http/http-minimum-reactive/src/main/java/io/quarkus/ts/http/minimum/reactive/ClusterResource.java index a77cf42cbd..53df42a3a7 100644 --- a/http/http-minimum-reactive/src/main/java/io/quarkus/ts/http/minimum/reactive/ClusterResource.java +++ b/http/http-minimum-reactive/src/main/java/io/quarkus/ts/http/minimum/reactive/ClusterResource.java @@ -1,9 +1,9 @@ package io.quarkus.ts.http.minimum.reactive; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import io.smallrye.mutiny.Uni; diff --git a/http/http-minimum-reactive/src/main/java/io/quarkus/ts/http/minimum/reactive/HelloResource.java b/http/http-minimum-reactive/src/main/java/io/quarkus/ts/http/minimum/reactive/HelloResource.java index 60d0a4870d..8447933b2a 100644 --- a/http/http-minimum-reactive/src/main/java/io/quarkus/ts/http/minimum/reactive/HelloResource.java +++ b/http/http-minimum-reactive/src/main/java/io/quarkus/ts/http/minimum/reactive/HelloResource.java @@ -1,14 +1,14 @@ package io.quarkus.ts.http.minimum.reactive; -import javax.ws.rs.Consumes; -import javax.ws.rs.DefaultValue; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DefaultValue; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import io.smallrye.mutiny.Uni; diff --git a/http/http-minimum-reactive/src/test/java/io/quarkus/ts/http/minimum/reactive/HttpCustomHeadersReactiveIT.java b/http/http-minimum-reactive/src/test/java/io/quarkus/ts/http/minimum/reactive/HttpCustomHeadersReactiveIT.java index 0e01f873f9..a26aff96e4 100644 --- a/http/http-minimum-reactive/src/test/java/io/quarkus/ts/http/minimum/reactive/HttpCustomHeadersReactiveIT.java +++ b/http/http-minimum-reactive/src/test/java/io/quarkus/ts/http/minimum/reactive/HttpCustomHeadersReactiveIT.java @@ -4,7 +4,7 @@ import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.CoreMatchers.is; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import org.apache.http.HttpStatus; import org.junit.jupiter.api.Tag; diff --git a/http/http-minimum/src/main/java/io/quarkus/ts/http/minimum/HelloResource.java b/http/http-minimum/src/main/java/io/quarkus/ts/http/minimum/HelloResource.java index 6f88e045f5..0a7444c239 100644 --- a/http/http-minimum/src/main/java/io/quarkus/ts/http/minimum/HelloResource.java +++ b/http/http-minimum/src/main/java/io/quarkus/ts/http/minimum/HelloResource.java @@ -1,14 +1,14 @@ package io.quarkus.ts.http.minimum; -import javax.ws.rs.Consumes; -import javax.ws.rs.DefaultValue; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DefaultValue; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; @Path("/hello") public class HelloResource { diff --git a/http/http-minimum/src/test/java/io/quarkus/ts/http/minimum/HttpCustomHeadersIT.java b/http/http-minimum/src/test/java/io/quarkus/ts/http/minimum/HttpCustomHeadersIT.java index 3539e5eb90..844b44c298 100644 --- a/http/http-minimum/src/test/java/io/quarkus/ts/http/minimum/HttpCustomHeadersIT.java +++ b/http/http-minimum/src/test/java/io/quarkus/ts/http/minimum/HttpCustomHeadersIT.java @@ -3,7 +3,7 @@ import static io.restassured.RestAssured.given; import static org.hamcrest.CoreMatchers.is; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import org.apache.http.HttpStatus; import org.junit.jupiter.api.Tag; diff --git a/http/jaxrs-reactive/src/main/java/io/quarkus/ts/http/jaxrs/reactive/CompressionResource.java b/http/jaxrs-reactive/src/main/java/io/quarkus/ts/http/jaxrs/reactive/CompressionResource.java index 6745c1eae9..76ae5126c0 100644 --- a/http/jaxrs-reactive/src/main/java/io/quarkus/ts/http/jaxrs/reactive/CompressionResource.java +++ b/http/jaxrs-reactive/src/main/java/io/quarkus/ts/http/jaxrs/reactive/CompressionResource.java @@ -2,11 +2,11 @@ import java.util.Random; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.jboss.logging.Logger; import org.jboss.resteasy.reactive.RestQuery; diff --git a/http/jaxrs-reactive/src/main/java/io/quarkus/ts/http/jaxrs/reactive/ExecutionModelResource.java b/http/jaxrs-reactive/src/main/java/io/quarkus/ts/http/jaxrs/reactive/ExecutionModelResource.java index 6d9039ff86..60113c1deb 100644 --- a/http/jaxrs-reactive/src/main/java/io/quarkus/ts/http/jaxrs/reactive/ExecutionModelResource.java +++ b/http/jaxrs-reactive/src/main/java/io/quarkus/ts/http/jaxrs/reactive/ExecutionModelResource.java @@ -3,8 +3,8 @@ import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionStage; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import io.smallrye.mutiny.Multi; import io.smallrye.mutiny.Uni; diff --git a/http/jaxrs-reactive/src/main/java/io/quarkus/ts/http/jaxrs/reactive/HttpCachingResource.java b/http/jaxrs-reactive/src/main/java/io/quarkus/ts/http/jaxrs/reactive/HttpCachingResource.java index a828f1fe71..13dc08c0ed 100644 --- a/http/jaxrs-reactive/src/main/java/io/quarkus/ts/http/jaxrs/reactive/HttpCachingResource.java +++ b/http/jaxrs-reactive/src/main/java/io/quarkus/ts/http/jaxrs/reactive/HttpCachingResource.java @@ -1,7 +1,7 @@ package io.quarkus.ts.http.jaxrs.reactive; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import org.jboss.resteasy.reactive.Cache; import org.jboss.resteasy.reactive.NoCache; diff --git a/http/jaxrs-reactive/src/main/java/io/quarkus/ts/http/jaxrs/reactive/MediaTypeResource.java b/http/jaxrs-reactive/src/main/java/io/quarkus/ts/http/jaxrs/reactive/MediaTypeResource.java index 45e4697146..886240345f 100644 --- a/http/jaxrs-reactive/src/main/java/io/quarkus/ts/http/jaxrs/reactive/MediaTypeResource.java +++ b/http/jaxrs-reactive/src/main/java/io/quarkus/ts/http/jaxrs/reactive/MediaTypeResource.java @@ -1,27 +1,27 @@ package io.quarkus.ts.http.jaxrs.reactive; import static io.quarkus.ts.http.jaxrs.reactive.MediaTypeResource.MEDIA_TYPE_PATH; -import static javax.ws.rs.core.HttpHeaders.CONTENT_TYPE; -import static javax.ws.rs.core.MediaType.APPLICATION_ATOM_XML; -import static javax.ws.rs.core.MediaType.APPLICATION_FORM_URLENCODED; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON_PATCH_JSON; -import static javax.ws.rs.core.MediaType.APPLICATION_OCTET_STREAM; -import static javax.ws.rs.core.MediaType.APPLICATION_SVG_XML; -import static javax.ws.rs.core.MediaType.APPLICATION_XHTML_XML; -import static javax.ws.rs.core.MediaType.APPLICATION_XML; -import static javax.ws.rs.core.MediaType.TEXT_XML; -import static javax.ws.rs.core.MediaType.WILDCARD; - -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.HeaderParam; -import javax.ws.rs.PATCH; -import javax.ws.rs.POST; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.Response; +import static jakarta.ws.rs.core.HttpHeaders.CONTENT_TYPE; +import static jakarta.ws.rs.core.MediaType.APPLICATION_ATOM_XML; +import static jakarta.ws.rs.core.MediaType.APPLICATION_FORM_URLENCODED; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON_PATCH_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_OCTET_STREAM; +import static jakarta.ws.rs.core.MediaType.APPLICATION_SVG_XML; +import static jakarta.ws.rs.core.MediaType.APPLICATION_XHTML_XML; +import static jakarta.ws.rs.core.MediaType.APPLICATION_XML; +import static jakarta.ws.rs.core.MediaType.TEXT_XML; +import static jakarta.ws.rs.core.MediaType.WILDCARD; + +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.HeaderParam; +import jakarta.ws.rs.PATCH; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.Response; @Path(MEDIA_TYPE_PATH) public class MediaTypeResource { diff --git a/http/jaxrs-reactive/src/main/java/io/quarkus/ts/http/jaxrs/reactive/MultipartBody.java b/http/jaxrs-reactive/src/main/java/io/quarkus/ts/http/jaxrs/reactive/MultipartBody.java index 102e37a229..1236fdb562 100644 --- a/http/jaxrs-reactive/src/main/java/io/quarkus/ts/http/jaxrs/reactive/MultipartBody.java +++ b/http/jaxrs-reactive/src/main/java/io/quarkus/ts/http/jaxrs/reactive/MultipartBody.java @@ -3,7 +3,7 @@ import java.io.File; import java.util.List; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import org.jboss.resteasy.reactive.PartType; import org.jboss.resteasy.reactive.RestForm; diff --git a/http/jaxrs-reactive/src/main/java/io/quarkus/ts/http/jaxrs/reactive/MultipartResource.java b/http/jaxrs-reactive/src/main/java/io/quarkus/ts/http/jaxrs/reactive/MultipartResource.java index 8744828c14..7669ca0001 100644 --- a/http/jaxrs-reactive/src/main/java/io/quarkus/ts/http/jaxrs/reactive/MultipartResource.java +++ b/http/jaxrs-reactive/src/main/java/io/quarkus/ts/http/jaxrs/reactive/MultipartResource.java @@ -5,11 +5,11 @@ import java.util.Collection; import java.util.stream.Collectors; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.apache.commons.io.IOUtils; import org.jboss.resteasy.reactive.multipart.FilePart; diff --git a/http/jaxrs-reactive/src/main/java/io/quarkus/ts/http/jaxrs/reactive/client/ClientMultipartBody.java b/http/jaxrs-reactive/src/main/java/io/quarkus/ts/http/jaxrs/reactive/client/ClientMultipartBody.java index 33626e22cd..111c589651 100644 --- a/http/jaxrs-reactive/src/main/java/io/quarkus/ts/http/jaxrs/reactive/client/ClientMultipartBody.java +++ b/http/jaxrs-reactive/src/main/java/io/quarkus/ts/http/jaxrs/reactive/client/ClientMultipartBody.java @@ -1,6 +1,6 @@ package io.quarkus.ts.http.jaxrs.reactive.client; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import org.jboss.resteasy.reactive.PartType; import org.jboss.resteasy.reactive.RestForm; diff --git a/http/jaxrs-reactive/src/main/java/io/quarkus/ts/http/jaxrs/reactive/client/MultipartClientResource.java b/http/jaxrs-reactive/src/main/java/io/quarkus/ts/http/jaxrs/reactive/client/MultipartClientResource.java index 9c0a355860..92caa0672b 100644 --- a/http/jaxrs-reactive/src/main/java/io/quarkus/ts/http/jaxrs/reactive/client/MultipartClientResource.java +++ b/http/jaxrs-reactive/src/main/java/io/quarkus/ts/http/jaxrs/reactive/client/MultipartClientResource.java @@ -1,10 +1,10 @@ package io.quarkus.ts.http.jaxrs.reactive.client; -import javax.inject.Inject; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.eclipse.microprofile.rest.client.inject.RestClient; diff --git a/http/jaxrs-reactive/src/main/java/io/quarkus/ts/http/jaxrs/reactive/client/MultipartService.java b/http/jaxrs-reactive/src/main/java/io/quarkus/ts/http/jaxrs/reactive/client/MultipartService.java index 92a438cc53..a4e105cf1f 100644 --- a/http/jaxrs-reactive/src/main/java/io/quarkus/ts/http/jaxrs/reactive/client/MultipartService.java +++ b/http/jaxrs-reactive/src/main/java/io/quarkus/ts/http/jaxrs/reactive/client/MultipartService.java @@ -1,10 +1,10 @@ package io.quarkus.ts.http.jaxrs.reactive.client; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; import org.jboss.resteasy.reactive.MultipartForm; diff --git a/http/jaxrs-reactive/src/main/java/io/quarkus/ts/http/jaxrs/reactive/json/JsonResource.java b/http/jaxrs-reactive/src/main/java/io/quarkus/ts/http/jaxrs/reactive/json/JsonResource.java index 5fca4c900f..3b680168d0 100644 --- a/http/jaxrs-reactive/src/main/java/io/quarkus/ts/http/jaxrs/reactive/json/JsonResource.java +++ b/http/jaxrs-reactive/src/main/java/io/quarkus/ts/http/jaxrs/reactive/json/JsonResource.java @@ -1,7 +1,7 @@ package io.quarkus.ts.http.jaxrs.reactive.json; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import com.fasterxml.jackson.annotation.JsonView; diff --git a/http/jaxrs-reactive/src/test/java/io/quarkus/ts/http/jaxrs/reactive/CompressionHandlerIT.java b/http/jaxrs-reactive/src/test/java/io/quarkus/ts/http/jaxrs/reactive/CompressionHandlerIT.java index 04ff4a9440..caade9525e 100644 --- a/http/jaxrs-reactive/src/test/java/io/quarkus/ts/http/jaxrs/reactive/CompressionHandlerIT.java +++ b/http/jaxrs-reactive/src/test/java/io/quarkus/ts/http/jaxrs/reactive/CompressionHandlerIT.java @@ -6,7 +6,7 @@ import java.util.Map; import java.util.Objects; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; diff --git a/http/jaxrs-reactive/src/test/java/io/quarkus/ts/http/jaxrs/reactive/MediaTypeSelectionIT.java b/http/jaxrs-reactive/src/test/java/io/quarkus/ts/http/jaxrs/reactive/MediaTypeSelectionIT.java index 5d5021a2ab..dd4d8e0320 100644 --- a/http/jaxrs-reactive/src/test/java/io/quarkus/ts/http/jaxrs/reactive/MediaTypeSelectionIT.java +++ b/http/jaxrs-reactive/src/test/java/io/quarkus/ts/http/jaxrs/reactive/MediaTypeSelectionIT.java @@ -10,15 +10,15 @@ import static io.restassured.http.ContentType.JSON; import static io.restassured.http.ContentType.MULTIPART; import static io.restassured.http.ContentType.XML; -import static javax.ws.rs.core.MediaType.APPLICATION_ATOM_XML; -import static javax.ws.rs.core.MediaType.APPLICATION_FORM_URLENCODED; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON_PATCH_JSON; -import static javax.ws.rs.core.MediaType.APPLICATION_SVG_XML; -import static javax.ws.rs.core.MediaType.APPLICATION_XHTML_XML; -import static javax.ws.rs.core.MediaType.APPLICATION_XML; -import static javax.ws.rs.core.MediaType.TEXT_XML; -import static javax.ws.rs.core.MediaType.WILDCARD; +import static jakarta.ws.rs.core.MediaType.APPLICATION_ATOM_XML; +import static jakarta.ws.rs.core.MediaType.APPLICATION_FORM_URLENCODED; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON_PATCH_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_SVG_XML; +import static jakarta.ws.rs.core.MediaType.APPLICATION_XHTML_XML; +import static jakarta.ws.rs.core.MediaType.APPLICATION_XML; +import static jakarta.ws.rs.core.MediaType.TEXT_XML; +import static jakarta.ws.rs.core.MediaType.WILDCARD; import org.hamcrest.Matchers; import org.junit.jupiter.api.Tag; diff --git a/http/jaxrs-reactive/src/test/java/io/quarkus/ts/http/jaxrs/reactive/RESTEasyReactiveMultipartIT.java b/http/jaxrs-reactive/src/test/java/io/quarkus/ts/http/jaxrs/reactive/RESTEasyReactiveMultipartIT.java index 0e699dfe02..e670cc44fe 100644 --- a/http/jaxrs-reactive/src/test/java/io/quarkus/ts/http/jaxrs/reactive/RESTEasyReactiveMultipartIT.java +++ b/http/jaxrs-reactive/src/test/java/io/quarkus/ts/http/jaxrs/reactive/RESTEasyReactiveMultipartIT.java @@ -9,7 +9,7 @@ import java.nio.charset.StandardCharsets; import java.util.Random; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import org.apache.commons.io.IOUtils; import org.junit.jupiter.api.BeforeAll; diff --git a/http/jaxrs/src/main/java/io/quarkus/ts/http/jaxrs/GreetingResource.java b/http/jaxrs/src/main/java/io/quarkus/ts/http/jaxrs/GreetingResource.java index 46ff58c9c8..7236662478 100644 --- a/http/jaxrs/src/main/java/io/quarkus/ts/http/jaxrs/GreetingResource.java +++ b/http/jaxrs/src/main/java/io/quarkus/ts/http/jaxrs/GreetingResource.java @@ -9,11 +9,11 @@ import java.util.List; import java.util.Map; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.JsonNode; diff --git a/http/jaxrs/src/main/java/io/quarkus/ts/http/jaxrs/MultipartBody.java b/http/jaxrs/src/main/java/io/quarkus/ts/http/jaxrs/MultipartBody.java index 26a2cb7e74..894a4bbf1c 100644 --- a/http/jaxrs/src/main/java/io/quarkus/ts/http/jaxrs/MultipartBody.java +++ b/http/jaxrs/src/main/java/io/quarkus/ts/http/jaxrs/MultipartBody.java @@ -2,8 +2,8 @@ import java.io.InputStream; -import javax.ws.rs.FormParam; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.FormParam; +import jakarta.ws.rs.core.MediaType; import org.jboss.resteasy.annotations.providers.multipart.PartType; diff --git a/http/jaxrs/src/main/java/io/quarkus/ts/http/jaxrs/MultipartResource.java b/http/jaxrs/src/main/java/io/quarkus/ts/http/jaxrs/MultipartResource.java index 2ae3e9f415..0e4ac866cd 100644 --- a/http/jaxrs/src/main/java/io/quarkus/ts/http/jaxrs/MultipartResource.java +++ b/http/jaxrs/src/main/java/io/quarkus/ts/http/jaxrs/MultipartResource.java @@ -2,11 +2,11 @@ import java.io.IOException; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.apache.commons.io.IOUtils; import org.jboss.resteasy.annotations.providers.multipart.MultipartForm; diff --git a/http/jaxrs/src/test/java/io/quarkus/ts/http/jaxrs/RESTEasyMultipartIT.java b/http/jaxrs/src/test/java/io/quarkus/ts/http/jaxrs/RESTEasyMultipartIT.java index a67c240897..135b767825 100644 --- a/http/jaxrs/src/test/java/io/quarkus/ts/http/jaxrs/RESTEasyMultipartIT.java +++ b/http/jaxrs/src/test/java/io/quarkus/ts/http/jaxrs/RESTEasyMultipartIT.java @@ -9,7 +9,7 @@ import java.nio.charset.StandardCharsets; import java.util.Random; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import org.apache.commons.io.IOUtils; import org.junit.jupiter.api.BeforeAll; diff --git a/http/reactive-routes/src/main/java/io/quarkus/ts/http/reactiveroutes/CompressionHandler.java b/http/reactive-routes/src/main/java/io/quarkus/ts/http/reactiveroutes/CompressionHandler.java index e56a1363aa..6e1ba8a1f8 100644 --- a/http/reactive-routes/src/main/java/io/quarkus/ts/http/reactiveroutes/CompressionHandler.java +++ b/http/reactive-routes/src/main/java/io/quarkus/ts/http/reactiveroutes/CompressionHandler.java @@ -1,6 +1,6 @@ package io.quarkus.ts.http.reactiveroutes; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import org.jboss.logging.Logger; diff --git a/http/reactive-routes/src/main/java/io/quarkus/ts/http/reactiveroutes/validation/Request.java b/http/reactive-routes/src/main/java/io/quarkus/ts/http/reactiveroutes/validation/Request.java index fb5e59527f..c0c5873893 100644 --- a/http/reactive-routes/src/main/java/io/quarkus/ts/http/reactiveroutes/validation/Request.java +++ b/http/reactive-routes/src/main/java/io/quarkus/ts/http/reactiveroutes/validation/Request.java @@ -1,7 +1,7 @@ package io.quarkus.ts.http.reactiveroutes.validation; -import javax.validation.constraints.Pattern; -import javax.validation.constraints.Size; +import jakarta.validation.constraints.Pattern; +import jakarta.validation.constraints.Size; import io.quarkus.ts.http.reactiveroutes.validation.annotations.Uppercase; diff --git a/http/reactive-routes/src/main/java/io/quarkus/ts/http/reactiveroutes/validation/Response.java b/http/reactive-routes/src/main/java/io/quarkus/ts/http/reactiveroutes/validation/Response.java index 18e407a3fb..493358f897 100644 --- a/http/reactive-routes/src/main/java/io/quarkus/ts/http/reactiveroutes/validation/Response.java +++ b/http/reactive-routes/src/main/java/io/quarkus/ts/http/reactiveroutes/validation/Response.java @@ -1,6 +1,6 @@ package io.quarkus.ts.http.reactiveroutes.validation; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import io.quarkus.ts.http.reactiveroutes.validation.annotations.Uppercase; diff --git a/http/reactive-routes/src/main/java/io/quarkus/ts/http/reactiveroutes/validation/ValidationOnRequestBodyRouteHandler.java b/http/reactive-routes/src/main/java/io/quarkus/ts/http/reactiveroutes/validation/ValidationOnRequestBodyRouteHandler.java index 9092fcf8ca..410978b170 100644 --- a/http/reactive-routes/src/main/java/io/quarkus/ts/http/reactiveroutes/validation/ValidationOnRequestBodyRouteHandler.java +++ b/http/reactive-routes/src/main/java/io/quarkus/ts/http/reactiveroutes/validation/ValidationOnRequestBodyRouteHandler.java @@ -1,6 +1,6 @@ package io.quarkus.ts.http.reactiveroutes.validation; -import javax.validation.Valid; +import jakarta.validation.Valid; import io.quarkus.vertx.web.Body; import io.quarkus.vertx.web.Route; diff --git a/http/reactive-routes/src/main/java/io/quarkus/ts/http/reactiveroutes/validation/ValidationOnRequestParamsRouteHandler.java b/http/reactive-routes/src/main/java/io/quarkus/ts/http/reactiveroutes/validation/ValidationOnRequestParamsRouteHandler.java index 09b5426f52..7d58104b5f 100644 --- a/http/reactive-routes/src/main/java/io/quarkus/ts/http/reactiveroutes/validation/ValidationOnRequestParamsRouteHandler.java +++ b/http/reactive-routes/src/main/java/io/quarkus/ts/http/reactiveroutes/validation/ValidationOnRequestParamsRouteHandler.java @@ -1,7 +1,7 @@ package io.quarkus.ts.http.reactiveroutes.validation; -import javax.validation.constraints.Pattern; -import javax.validation.constraints.Size; +import jakarta.validation.constraints.Pattern; +import jakarta.validation.constraints.Size; import io.quarkus.ts.http.reactiveroutes.validation.annotations.Uppercase; import io.quarkus.vertx.web.Param; diff --git a/http/reactive-routes/src/main/java/io/quarkus/ts/http/reactiveroutes/validation/ValidationOnResponseRouteHandler.java b/http/reactive-routes/src/main/java/io/quarkus/ts/http/reactiveroutes/validation/ValidationOnResponseRouteHandler.java index 0203212a49..10e5fd335f 100644 --- a/http/reactive-routes/src/main/java/io/quarkus/ts/http/reactiveroutes/validation/ValidationOnResponseRouteHandler.java +++ b/http/reactive-routes/src/main/java/io/quarkus/ts/http/reactiveroutes/validation/ValidationOnResponseRouteHandler.java @@ -1,6 +1,6 @@ package io.quarkus.ts.http.reactiveroutes.validation; -import javax.validation.Valid; +import jakarta.validation.Valid; import io.quarkus.vertx.web.Route; import io.quarkus.vertx.web.Route.HttpMethod; diff --git a/http/reactive-routes/src/main/java/io/quarkus/ts/http/reactiveroutes/validation/annotations/Uppercase.java b/http/reactive-routes/src/main/java/io/quarkus/ts/http/reactiveroutes/validation/annotations/Uppercase.java index 46b4570dea..07b693f337 100644 --- a/http/reactive-routes/src/main/java/io/quarkus/ts/http/reactiveroutes/validation/annotations/Uppercase.java +++ b/http/reactive-routes/src/main/java/io/quarkus/ts/http/reactiveroutes/validation/annotations/Uppercase.java @@ -12,8 +12,8 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.validation.Constraint; -import javax.validation.Payload; +import jakarta.validation.Constraint; +import jakarta.validation.Payload; /** * Validates whether the value is uppercase diff --git a/http/reactive-routes/src/main/java/io/quarkus/ts/http/reactiveroutes/validation/annotations/UppercaseService.java b/http/reactive-routes/src/main/java/io/quarkus/ts/http/reactiveroutes/validation/annotations/UppercaseService.java index 454879d516..8f86f7bb52 100644 --- a/http/reactive-routes/src/main/java/io/quarkus/ts/http/reactiveroutes/validation/annotations/UppercaseService.java +++ b/http/reactive-routes/src/main/java/io/quarkus/ts/http/reactiveroutes/validation/annotations/UppercaseService.java @@ -1,6 +1,6 @@ package io.quarkus.ts.http.reactiveroutes.validation.annotations; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class UppercaseService { diff --git a/http/reactive-routes/src/main/java/io/quarkus/ts/http/reactiveroutes/validation/annotations/UppercaseValidator.java b/http/reactive-routes/src/main/java/io/quarkus/ts/http/reactiveroutes/validation/annotations/UppercaseValidator.java index 0bfa8d0773..4b43bc5f27 100644 --- a/http/reactive-routes/src/main/java/io/quarkus/ts/http/reactiveroutes/validation/annotations/UppercaseValidator.java +++ b/http/reactive-routes/src/main/java/io/quarkus/ts/http/reactiveroutes/validation/annotations/UppercaseValidator.java @@ -1,9 +1,9 @@ package io.quarkus.ts.http.reactiveroutes.validation.annotations; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import javax.validation.ConstraintValidator; -import javax.validation.ConstraintValidatorContext; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorContext; @ApplicationScoped public class UppercaseValidator implements ConstraintValidator { diff --git a/http/reactive-routes/src/test/java/io/quarkus/ts/http/reactiveroutes/CompressionHandlerIT.java b/http/reactive-routes/src/test/java/io/quarkus/ts/http/reactiveroutes/CompressionHandlerIT.java index 00f2a89877..086afef29d 100644 --- a/http/reactive-routes/src/test/java/io/quarkus/ts/http/reactiveroutes/CompressionHandlerIT.java +++ b/http/reactive-routes/src/test/java/io/quarkus/ts/http/reactiveroutes/CompressionHandlerIT.java @@ -9,7 +9,7 @@ import java.util.Map; import java.util.Objects; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; diff --git a/http/rest-client-reactive/src/main/java/io/quarkus/ts/http/restclient/reactive/BookClient.java b/http/rest-client-reactive/src/main/java/io/quarkus/ts/http/restclient/reactive/BookClient.java index 5dbd9ce61b..d85d4a25d5 100644 --- a/http/rest-client-reactive/src/main/java/io/quarkus/ts/http/restclient/reactive/BookClient.java +++ b/http/rest-client-reactive/src/main/java/io/quarkus/ts/http/restclient/reactive/BookClient.java @@ -3,13 +3,13 @@ import java.util.List; import java.util.Map; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; import org.eclipse.microprofile.rest.client.annotation.RegisterClientHeaders; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; diff --git a/http/rest-client-reactive/src/main/java/io/quarkus/ts/http/restclient/reactive/ResourceAndSubResourcesClient.java b/http/rest-client-reactive/src/main/java/io/quarkus/ts/http/restclient/reactive/ResourceAndSubResourcesClient.java index 8c43d42367..1794d5d225 100644 --- a/http/rest-client-reactive/src/main/java/io/quarkus/ts/http/restclient/reactive/ResourceAndSubResourcesClient.java +++ b/http/rest-client-reactive/src/main/java/io/quarkus/ts/http/restclient/reactive/ResourceAndSubResourcesClient.java @@ -1,11 +1,11 @@ package io.quarkus.ts.http.restclient.reactive; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.eclipse.microprofile.rest.client.annotation.RegisterClientHeaders; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; diff --git a/http/rest-client-reactive/src/main/java/io/quarkus/ts/http/restclient/reactive/files/FileClient.java b/http/rest-client-reactive/src/main/java/io/quarkus/ts/http/restclient/reactive/files/FileClient.java index eabcfbdc29..e522255f4f 100644 --- a/http/rest-client-reactive/src/main/java/io/quarkus/ts/http/restclient/reactive/files/FileClient.java +++ b/http/rest-client-reactive/src/main/java/io/quarkus/ts/http/restclient/reactive/files/FileClient.java @@ -2,12 +2,12 @@ import java.io.File; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.eclipse.microprofile.rest.client.annotation.RegisterClientHeaders; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; diff --git a/http/rest-client-reactive/src/main/java/io/quarkus/ts/http/restclient/reactive/files/FileClientResource.java b/http/rest-client-reactive/src/main/java/io/quarkus/ts/http/restclient/reactive/files/FileClientResource.java index 0dfcbdb465..25fa09431d 100644 --- a/http/rest-client-reactive/src/main/java/io/quarkus/ts/http/restclient/reactive/files/FileClientResource.java +++ b/http/rest-client-reactive/src/main/java/io/quarkus/ts/http/restclient/reactive/files/FileClientResource.java @@ -6,11 +6,11 @@ import java.util.List; import java.util.Optional; -import javax.inject.Inject; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; +import jakarta.inject.Inject; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; import org.eclipse.microprofile.config.inject.ConfigProperty; import org.eclipse.microprofile.rest.client.inject.RestClient; diff --git a/http/rest-client-reactive/src/main/java/io/quarkus/ts/http/restclient/reactive/files/FileResource.java b/http/rest-client-reactive/src/main/java/io/quarkus/ts/http/restclient/reactive/files/FileResource.java index e5032b9a2f..ee3c37ee5f 100644 --- a/http/rest-client-reactive/src/main/java/io/quarkus/ts/http/restclient/reactive/files/FileResource.java +++ b/http/rest-client-reactive/src/main/java/io/quarkus/ts/http/restclient/reactive/files/FileResource.java @@ -7,13 +7,13 @@ import java.util.List; import java.util.Optional; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.eclipse.microprofile.config.inject.ConfigProperty; import org.jboss.resteasy.reactive.MultipartForm; diff --git a/http/rest-client-reactive/src/main/java/io/quarkus/ts/http/restclient/reactive/files/FileWrapper.java b/http/rest-client-reactive/src/main/java/io/quarkus/ts/http/restclient/reactive/files/FileWrapper.java index b74a61864e..d87c82dbc9 100644 --- a/http/rest-client-reactive/src/main/java/io/quarkus/ts/http/restclient/reactive/files/FileWrapper.java +++ b/http/rest-client-reactive/src/main/java/io/quarkus/ts/http/restclient/reactive/files/FileWrapper.java @@ -2,7 +2,7 @@ import java.io.File; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import org.jboss.resteasy.reactive.PartType; import org.jboss.resteasy.reactive.RestForm; diff --git a/http/rest-client-reactive/src/main/java/io/quarkus/ts/http/restclient/reactive/files/OsUtils.java b/http/rest-client-reactive/src/main/java/io/quarkus/ts/http/restclient/reactive/files/OsUtils.java index 5390293a5a..68c283984e 100644 --- a/http/rest-client-reactive/src/main/java/io/quarkus/ts/http/restclient/reactive/files/OsUtils.java +++ b/http/rest-client-reactive/src/main/java/io/quarkus/ts/http/restclient/reactive/files/OsUtils.java @@ -10,7 +10,7 @@ import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; -import javax.xml.bind.DatatypeConverter; +import jakarta.xml.bind.DatatypeConverter; public abstract class OsUtils { public static final long SIZE_2049MiB = 2148532224L; diff --git a/http/rest-client-reactive/src/main/java/io/quarkus/ts/http/restclient/reactive/json/BookAsJsonResource.java b/http/rest-client-reactive/src/main/java/io/quarkus/ts/http/restclient/reactive/json/BookAsJsonResource.java index 03fc69a81c..95d2a48ee8 100644 --- a/http/rest-client-reactive/src/main/java/io/quarkus/ts/http/restclient/reactive/json/BookAsJsonResource.java +++ b/http/rest-client-reactive/src/main/java/io/quarkus/ts/http/restclient/reactive/json/BookAsJsonResource.java @@ -2,11 +2,11 @@ import java.util.Map; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import io.smallrye.mutiny.Uni; import io.vertx.core.json.Json; diff --git a/http/rest-client-reactive/src/main/java/io/quarkus/ts/http/restclient/reactive/json/IdBeanParam.java b/http/rest-client-reactive/src/main/java/io/quarkus/ts/http/restclient/reactive/json/IdBeanParam.java index 5a82896a85..de08728e28 100644 --- a/http/rest-client-reactive/src/main/java/io/quarkus/ts/http/restclient/reactive/json/IdBeanParam.java +++ b/http/rest-client-reactive/src/main/java/io/quarkus/ts/http/restclient/reactive/json/IdBeanParam.java @@ -1,6 +1,6 @@ package io.quarkus.ts.http.restclient.reactive.json; -import javax.ws.rs.PathParam; +import jakarta.ws.rs.PathParam; public class IdBeanParam { private final String id; diff --git a/http/rest-client-reactive/src/main/java/io/quarkus/ts/http/restclient/reactive/json/JsonParamConverterProvider.java b/http/rest-client-reactive/src/main/java/io/quarkus/ts/http/restclient/reactive/json/JsonParamConverterProvider.java index 0a5cea919d..8d3ef819ca 100644 --- a/http/rest-client-reactive/src/main/java/io/quarkus/ts/http/restclient/reactive/json/JsonParamConverterProvider.java +++ b/http/rest-client-reactive/src/main/java/io/quarkus/ts/http/restclient/reactive/json/JsonParamConverterProvider.java @@ -4,13 +4,13 @@ import java.lang.reflect.Type; import java.util.Arrays; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.ext.ParamConverter; -import javax.ws.rs.ext.ParamConverterProvider; -import javax.ws.rs.ext.Provider; -import javax.ws.rs.ext.Providers; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.ext.ParamConverter; +import jakarta.ws.rs.ext.ParamConverterProvider; +import jakarta.ws.rs.ext.Provider; +import jakarta.ws.rs.ext.Providers; import org.apache.commons.lang3.ClassUtils; diff --git a/http/rest-client-reactive/src/main/java/io/quarkus/ts/http/restclient/reactive/json/JsonRestInterface.java b/http/rest-client-reactive/src/main/java/io/quarkus/ts/http/restclient/reactive/json/JsonRestInterface.java index a47816e7ac..a321930bc2 100644 --- a/http/rest-client-reactive/src/main/java/io/quarkus/ts/http/restclient/reactive/json/JsonRestInterface.java +++ b/http/rest-client-reactive/src/main/java/io/quarkus/ts/http/restclient/reactive/json/JsonRestInterface.java @@ -1,11 +1,11 @@ package io.quarkus.ts.http.restclient.reactive.json; -import javax.ws.rs.BeanParam; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.BeanParam; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.eclipse.microprofile.rest.client.annotation.RegisterClientHeaders; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; diff --git a/http/rest-client-reactive/src/main/java/io/quarkus/ts/http/restclient/reactive/proxy/ProxyClient.java b/http/rest-client-reactive/src/main/java/io/quarkus/ts/http/restclient/reactive/proxy/ProxyClient.java index 93c91d983e..7300dc3746 100644 --- a/http/rest-client-reactive/src/main/java/io/quarkus/ts/http/restclient/reactive/proxy/ProxyClient.java +++ b/http/rest-client-reactive/src/main/java/io/quarkus/ts/http/restclient/reactive/proxy/ProxyClient.java @@ -1,10 +1,10 @@ package io.quarkus.ts.http.restclient.reactive.proxy; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import org.eclipse.microprofile.rest.client.annotation.RegisterClientHeaders; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; diff --git a/http/rest-client-reactive/src/main/java/io/quarkus/ts/http/restclient/reactive/proxy/ProxyResource.java b/http/rest-client-reactive/src/main/java/io/quarkus/ts/http/restclient/reactive/proxy/ProxyResource.java index c3785d8340..1af3fe2dca 100644 --- a/http/rest-client-reactive/src/main/java/io/quarkus/ts/http/restclient/reactive/proxy/ProxyResource.java +++ b/http/rest-client-reactive/src/main/java/io/quarkus/ts/http/restclient/reactive/proxy/ProxyResource.java @@ -1,11 +1,11 @@ package io.quarkus.ts.http.restclient.reactive.proxy; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import org.eclipse.microprofile.rest.client.inject.RestClient; diff --git a/http/rest-client-reactive/src/main/java/io/quarkus/ts/http/restclient/reactive/resources/PlainBookResource.java b/http/rest-client-reactive/src/main/java/io/quarkus/ts/http/restclient/reactive/resources/PlainBookResource.java index 39d3d075e5..4fc1669f46 100644 --- a/http/rest-client-reactive/src/main/java/io/quarkus/ts/http/restclient/reactive/resources/PlainBookResource.java +++ b/http/rest-client-reactive/src/main/java/io/quarkus/ts/http/restclient/reactive/resources/PlainBookResource.java @@ -4,12 +4,12 @@ import java.util.List; import java.util.Map; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; import org.jboss.resteasy.reactive.RestQuery; diff --git a/http/rest-client-reactive/src/main/java/io/quarkus/ts/http/restclient/reactive/resources/PlainComplexClientResource.java b/http/rest-client-reactive/src/main/java/io/quarkus/ts/http/restclient/reactive/resources/PlainComplexClientResource.java index 43b460c28c..9739ef2127 100644 --- a/http/rest-client-reactive/src/main/java/io/quarkus/ts/http/restclient/reactive/resources/PlainComplexClientResource.java +++ b/http/rest-client-reactive/src/main/java/io/quarkus/ts/http/restclient/reactive/resources/PlainComplexClientResource.java @@ -3,14 +3,14 @@ import java.net.URI; import java.net.URISyntaxException; -import javax.inject.Inject; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; import org.apache.commons.lang3.StringUtils; import org.eclipse.microprofile.rest.client.RestClientBuilder; diff --git a/http/rest-client-reactive/src/main/java/io/quarkus/ts/http/restclient/reactive/resources/ReactiveClientBookResource.java b/http/rest-client-reactive/src/main/java/io/quarkus/ts/http/restclient/reactive/resources/ReactiveClientBookResource.java index d5b4e1ffe8..20e75d46f6 100644 --- a/http/rest-client-reactive/src/main/java/io/quarkus/ts/http/restclient/reactive/resources/ReactiveClientBookResource.java +++ b/http/rest-client-reactive/src/main/java/io/quarkus/ts/http/restclient/reactive/resources/ReactiveClientBookResource.java @@ -3,14 +3,14 @@ import java.util.List; import java.util.Map; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedHashMap; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedHashMap; import org.eclipse.microprofile.rest.client.inject.RestClient; diff --git a/http/rest-client-reactive/src/main/java/io/quarkus/ts/http/restclient/reactive/resources/ReactivecomplexClientResource.java b/http/rest-client-reactive/src/main/java/io/quarkus/ts/http/restclient/reactive/resources/ReactivecomplexClientResource.java index 2be36ba211..0092a0ef0d 100644 --- a/http/rest-client-reactive/src/main/java/io/quarkus/ts/http/restclient/reactive/resources/ReactivecomplexClientResource.java +++ b/http/rest-client-reactive/src/main/java/io/quarkus/ts/http/restclient/reactive/resources/ReactivecomplexClientResource.java @@ -1,8 +1,8 @@ package io.quarkus.ts.http.restclient.reactive.resources; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; @Path("/clients/{rootPath}/resource-server") public class ReactivecomplexClientResource { diff --git a/http/rest-client-reactive/src/test/java/io/quarkus/ts/http/restclient/reactive/LargeFileHandlingIT.java b/http/rest-client-reactive/src/test/java/io/quarkus/ts/http/restclient/reactive/LargeFileHandlingIT.java index dc8b2da277..160216aee7 100644 --- a/http/rest-client-reactive/src/test/java/io/quarkus/ts/http/restclient/reactive/LargeFileHandlingIT.java +++ b/http/rest-client-reactive/src/test/java/io/quarkus/ts/http/restclient/reactive/LargeFileHandlingIT.java @@ -11,7 +11,7 @@ import java.nio.file.Path; import java.util.function.Predicate; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.http.HttpStatus; import org.junit.jupiter.api.AfterAll; diff --git a/http/rest-client-reactive/src/test/java/io/quarkus/ts/http/restclient/reactive/ReactiveRestClientIT.java b/http/rest-client-reactive/src/test/java/io/quarkus/ts/http/restclient/reactive/ReactiveRestClientIT.java index 94cb052074..3d3aba78e3 100644 --- a/http/rest-client-reactive/src/test/java/io/quarkus/ts/http/restclient/reactive/ReactiveRestClientIT.java +++ b/http/rest-client-reactive/src/test/java/io/quarkus/ts/http/restclient/reactive/ReactiveRestClientIT.java @@ -151,7 +151,7 @@ public void encodedRequestPath() { } /** - * Test class annotated with {@link javax.ws.rs.Path} and registered as client via + * Test class annotated with {@link jakarta.ws.rs.Path} and registered as client via * {@link org.eclipse.microprofile.rest.client.inject.RegisterRestClient} must not be included in OpenAPI Document. */ @DisabledOnQuarkusVersion(version = "(2\\.[0-6]\\..*)|(2\\.7\\.[0-5]\\..*)", reason = "Fixed in Quarkus 2.7.6.") diff --git a/http/rest-client/src/main/java/io/quarkus/ts/http/restclient/ClientBookResource.java b/http/rest-client/src/main/java/io/quarkus/ts/http/restclient/ClientBookResource.java index f0700d1e37..76b932555b 100644 --- a/http/rest-client/src/main/java/io/quarkus/ts/http/restclient/ClientBookResource.java +++ b/http/rest-client/src/main/java/io/quarkus/ts/http/restclient/ClientBookResource.java @@ -1,10 +1,10 @@ package io.quarkus.ts.http.restclient; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.eclipse.microprofile.rest.client.inject.RestClient; diff --git a/http/rest-client/src/main/java/io/quarkus/ts/http/restclient/RestInterface.java b/http/rest-client/src/main/java/io/quarkus/ts/http/restclient/RestInterface.java index 1eb9fe55ce..00539461a9 100644 --- a/http/rest-client/src/main/java/io/quarkus/ts/http/restclient/RestInterface.java +++ b/http/rest-client/src/main/java/io/quarkus/ts/http/restclient/RestInterface.java @@ -1,9 +1,9 @@ package io.quarkus.ts.http.restclient; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.eclipse.microprofile.rest.client.annotation.RegisterClientHeaders; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; diff --git a/http/rest-client/src/main/java/io/quarkus/ts/http/restclient/xml/Book.java b/http/rest-client/src/main/java/io/quarkus/ts/http/restclient/xml/Book.java index 481aea2b25..6d52c0b889 100644 --- a/http/rest-client/src/main/java/io/quarkus/ts/http/restclient/xml/Book.java +++ b/http/rest-client/src/main/java/io/quarkus/ts/http/restclient/xml/Book.java @@ -1,6 +1,6 @@ package io.quarkus.ts.http.restclient.xml; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; @XmlRootElement public class Book { diff --git a/http/rest-client/src/main/java/io/quarkus/ts/http/restclient/xml/BookAsJsonResource.java b/http/rest-client/src/main/java/io/quarkus/ts/http/restclient/xml/BookAsJsonResource.java index f6df031ab7..8e7e822aa2 100644 --- a/http/rest-client/src/main/java/io/quarkus/ts/http/restclient/xml/BookAsJsonResource.java +++ b/http/rest-client/src/main/java/io/quarkus/ts/http/restclient/xml/BookAsJsonResource.java @@ -1,9 +1,9 @@ package io.quarkus.ts.http.restclient.xml; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; @Produces(MediaType.APPLICATION_JSON) @Path("/book/json") diff --git a/http/rest-client/src/main/java/io/quarkus/ts/http/restclient/xml/BookAsXmlResource.java b/http/rest-client/src/main/java/io/quarkus/ts/http/restclient/xml/BookAsXmlResource.java index 7d25a31dbb..37bca1b213 100644 --- a/http/rest-client/src/main/java/io/quarkus/ts/http/restclient/xml/BookAsXmlResource.java +++ b/http/rest-client/src/main/java/io/quarkus/ts/http/restclient/xml/BookAsXmlResource.java @@ -1,9 +1,9 @@ package io.quarkus.ts.http.restclient.xml; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; @Produces(MediaType.APPLICATION_XML) @Path("/book/xml") diff --git a/http/servlet-undertow/src/main/java/io/quarkus/ts/http/undertow/filters/CustomRequestFilter.java b/http/servlet-undertow/src/main/java/io/quarkus/ts/http/undertow/filters/CustomRequestFilter.java index 93d2308d89..8a04fe52c2 100644 --- a/http/servlet-undertow/src/main/java/io/quarkus/ts/http/undertow/filters/CustomRequestFilter.java +++ b/http/servlet-undertow/src/main/java/io/quarkus/ts/http/undertow/filters/CustomRequestFilter.java @@ -2,12 +2,12 @@ import java.io.IOException; -import javax.enterprise.context.ApplicationScoped; -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.servlet.Filter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; import org.jboss.logging.Logger; diff --git a/http/servlet-undertow/src/main/java/io/quarkus/ts/http/undertow/listener/SessionListener.java b/http/servlet-undertow/src/main/java/io/quarkus/ts/http/undertow/listener/SessionListener.java index 573b0e383e..633993c534 100644 --- a/http/servlet-undertow/src/main/java/io/quarkus/ts/http/undertow/listener/SessionListener.java +++ b/http/servlet-undertow/src/main/java/io/quarkus/ts/http/undertow/listener/SessionListener.java @@ -2,10 +2,10 @@ import java.util.LinkedList; -import javax.enterprise.context.ApplicationScoped; -import javax.servlet.http.HttpSession; -import javax.servlet.http.HttpSessionEvent; -import javax.servlet.http.HttpSessionListener; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.servlet.http.HttpSession; +import jakarta.servlet.http.HttpSessionEvent; +import jakarta.servlet.http.HttpSessionListener; import io.micrometer.core.instrument.MeterRegistry; import io.micrometer.core.instrument.Tags; diff --git a/http/servlet-undertow/src/main/java/io/quarkus/ts/http/undertow/servlets/HelloWorld.java b/http/servlet-undertow/src/main/java/io/quarkus/ts/http/undertow/servlets/HelloWorld.java index 24715524e0..d7b9aa730d 100644 --- a/http/servlet-undertow/src/main/java/io/quarkus/ts/http/undertow/servlets/HelloWorld.java +++ b/http/servlet-undertow/src/main/java/io/quarkus/ts/http/undertow/servlets/HelloWorld.java @@ -3,11 +3,11 @@ import java.io.IOException; import java.io.PrintWriter; -import javax.enterprise.context.ApplicationScoped; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.jboss.logging.Logger; diff --git a/http/vertx-web-client/src/main/java/io/quarkus/ts/http/vertx/webclient/handler/ChuckNorrisResource.java b/http/vertx-web-client/src/main/java/io/quarkus/ts/http/vertx/webclient/handler/ChuckNorrisResource.java index 257813d958..f0e1190c08 100644 --- a/http/vertx-web-client/src/main/java/io/quarkus/ts/http/vertx/webclient/handler/ChuckNorrisResource.java +++ b/http/vertx-web-client/src/main/java/io/quarkus/ts/http/vertx/webclient/handler/ChuckNorrisResource.java @@ -8,8 +8,8 @@ import java.util.List; import java.util.function.BiFunction; -import javax.annotation.PostConstruct; -import javax.inject.Inject; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Inject; import org.eclipse.microprofile.config.inject.ConfigProperty; diff --git a/http/vertx-web-client/src/main/java/io/quarkus/ts/http/vertx/webclient/handler/FailureHandler.java b/http/vertx-web-client/src/main/java/io/quarkus/ts/http/vertx/webclient/handler/FailureHandler.java index 3a4bd6c23f..862e9a0f51 100644 --- a/http/vertx-web-client/src/main/java/io/quarkus/ts/http/vertx/webclient/handler/FailureHandler.java +++ b/http/vertx-web-client/src/main/java/io/quarkus/ts/http/vertx/webclient/handler/FailureHandler.java @@ -2,7 +2,7 @@ import java.net.HttpURLConnection; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import io.quarkus.vertx.web.Route; import io.smallrye.mutiny.TimeoutException; diff --git a/http/vertx-web-client/src/main/java/io/quarkus/ts/http/vertx/webclient/handler/TracingExampleResource.java b/http/vertx-web-client/src/main/java/io/quarkus/ts/http/vertx/webclient/handler/TracingExampleResource.java index 467e63f513..fffd74ee9c 100644 --- a/http/vertx-web-client/src/main/java/io/quarkus/ts/http/vertx/webclient/handler/TracingExampleResource.java +++ b/http/vertx-web-client/src/main/java/io/quarkus/ts/http/vertx/webclient/handler/TracingExampleResource.java @@ -1,6 +1,6 @@ package io.quarkus.ts.http.vertx.webclient.handler; -import javax.inject.Inject; +import jakarta.inject.Inject; import io.quarkus.ts.http.vertx.webclient.service.PongService; import io.quarkus.vertx.web.Route; diff --git a/http/vertx-web-client/src/main/java/io/quarkus/ts/http/vertx/webclient/service/PongService.java b/http/vertx-web-client/src/main/java/io/quarkus/ts/http/vertx/webclient/service/PongService.java index d8b0e80183..71013cdec7 100644 --- a/http/vertx-web-client/src/main/java/io/quarkus/ts/http/vertx/webclient/service/PongService.java +++ b/http/vertx-web-client/src/main/java/io/quarkus/ts/http/vertx/webclient/service/PongService.java @@ -2,9 +2,9 @@ import java.net.HttpURLConnection; -import javax.annotation.PostConstruct; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.annotation.PostConstruct; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.eclipse.microprofile.config.inject.ConfigProperty; diff --git a/http/vertx/src/main/java/io/quarkus/ts/vertx/HelloResource.java b/http/vertx/src/main/java/io/quarkus/ts/vertx/HelloResource.java index f65db94cc1..6a5620f618 100644 --- a/http/vertx/src/main/java/io/quarkus/ts/vertx/HelloResource.java +++ b/http/vertx/src/main/java/io/quarkus/ts/vertx/HelloResource.java @@ -1,12 +1,12 @@ package io.quarkus.ts.vertx; -import javax.inject.Inject; -import javax.ws.rs.DefaultValue; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +import jakarta.ws.rs.DefaultValue; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; import io.smallrye.mutiny.Uni; import io.vertx.mutiny.core.Vertx; diff --git a/infinispan-client/src/main/java/io/quarkus/ts/infinispan/client/FirstCounterResource.java b/infinispan-client/src/main/java/io/quarkus/ts/infinispan/client/FirstCounterResource.java index 74319a9c54..8a58b895a1 100644 --- a/infinispan-client/src/main/java/io/quarkus/ts/infinispan/client/FirstCounterResource.java +++ b/infinispan-client/src/main/java/io/quarkus/ts/infinispan/client/FirstCounterResource.java @@ -1,6 +1,6 @@ package io.quarkus.ts.infinispan.client; -import javax.ws.rs.Path; +import jakarta.ws.rs.Path; @Path("/first-counter") public class FirstCounterResource extends InfinispanCounterResource { diff --git a/infinispan-client/src/main/java/io/quarkus/ts/infinispan/client/InfinispanClientApp.java b/infinispan-client/src/main/java/io/quarkus/ts/infinispan/client/InfinispanClientApp.java index c60a9fae9f..8ddb9d9bef 100644 --- a/infinispan-client/src/main/java/io/quarkus/ts/infinispan/client/InfinispanClientApp.java +++ b/infinispan-client/src/main/java/io/quarkus/ts/infinispan/client/InfinispanClientApp.java @@ -1,8 +1,8 @@ package io.quarkus.ts.infinispan.client; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.event.Observes; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.event.Observes; +import jakarta.inject.Inject; import org.infinispan.client.hotrod.RemoteCache; import org.infinispan.client.hotrod.RemoteCacheManager; diff --git a/infinispan-client/src/main/java/io/quarkus/ts/infinispan/client/InfinispanCounterResource.java b/infinispan-client/src/main/java/io/quarkus/ts/infinispan/client/InfinispanCounterResource.java index e3713c9092..e96df38bf6 100644 --- a/infinispan-client/src/main/java/io/quarkus/ts/infinispan/client/InfinispanCounterResource.java +++ b/infinispan-client/src/main/java/io/quarkus/ts/infinispan/client/InfinispanCounterResource.java @@ -2,12 +2,12 @@ import java.util.concurrent.atomic.AtomicInteger; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.infinispan.client.hotrod.RemoteCache; diff --git a/infinispan-client/src/main/java/io/quarkus/ts/infinispan/client/SecondCounterResource.java b/infinispan-client/src/main/java/io/quarkus/ts/infinispan/client/SecondCounterResource.java index 6294c22ecf..5c650a1c22 100644 --- a/infinispan-client/src/main/java/io/quarkus/ts/infinispan/client/SecondCounterResource.java +++ b/infinispan-client/src/main/java/io/quarkus/ts/infinispan/client/SecondCounterResource.java @@ -1,6 +1,6 @@ package io.quarkus.ts.infinispan.client; -import javax.ws.rs.Path; +import jakarta.ws.rs.Path; @Path("/second-counter") public class SecondCounterResource extends InfinispanCounterResource { diff --git a/infinispan-client/src/main/java/io/quarkus/ts/infinispan/client/serialized/ShopItemResource.java b/infinispan-client/src/main/java/io/quarkus/ts/infinispan/client/serialized/ShopItemResource.java index 39a4897d78..ace480a6dd 100644 --- a/infinispan-client/src/main/java/io/quarkus/ts/infinispan/client/serialized/ShopItemResource.java +++ b/infinispan-client/src/main/java/io/quarkus/ts/infinispan/client/serialized/ShopItemResource.java @@ -3,14 +3,14 @@ import java.util.List; import java.util.concurrent.TimeUnit; -import javax.inject.Inject; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; import org.infinispan.client.hotrod.RemoteCache; import org.infinispan.query.dsl.Query; diff --git a/infinispan-client/src/test/java/io/quarkus/ts/infinispan/client/BaseOpenShiftInfinispanIT.java b/infinispan-client/src/test/java/io/quarkus/ts/infinispan/client/BaseOpenShiftInfinispanIT.java index 94b19352d9..8b931f40c7 100644 --- a/infinispan-client/src/test/java/io/quarkus/ts/infinispan/client/BaseOpenShiftInfinispanIT.java +++ b/infinispan-client/src/test/java/io/quarkus/ts/infinispan/client/BaseOpenShiftInfinispanIT.java @@ -7,7 +7,7 @@ import java.nio.file.Path; import java.nio.file.Paths; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Assertions; diff --git a/javaee-like-getting-started/src/main/java/io/quarkus/ts/javaee/gettingstarted/CustomHealthCheckGroup.java b/javaee-like-getting-started/src/main/java/io/quarkus/ts/javaee/gettingstarted/CustomHealthCheckGroup.java index 0b6b9a0e32..d6e6e54a0c 100644 --- a/javaee-like-getting-started/src/main/java/io/quarkus/ts/javaee/gettingstarted/CustomHealthCheckGroup.java +++ b/javaee-like-getting-started/src/main/java/io/quarkus/ts/javaee/gettingstarted/CustomHealthCheckGroup.java @@ -1,6 +1,6 @@ package io.quarkus.ts.javaee.gettingstarted; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.eclipse.microprofile.health.HealthCheck; import org.eclipse.microprofile.health.HealthCheckResponse; diff --git a/javaee-like-getting-started/src/main/java/io/quarkus/ts/javaee/gettingstarted/FallbackResource.java b/javaee-like-getting-started/src/main/java/io/quarkus/ts/javaee/gettingstarted/FallbackResource.java index e9569ce61b..d211a242ce 100644 --- a/javaee-like-getting-started/src/main/java/io/quarkus/ts/javaee/gettingstarted/FallbackResource.java +++ b/javaee-like-getting-started/src/main/java/io/quarkus/ts/javaee/gettingstarted/FallbackResource.java @@ -1,7 +1,7 @@ package io.quarkus.ts.javaee.gettingstarted; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import org.eclipse.microprofile.faulttolerance.Fallback; diff --git a/javaee-like-getting-started/src/main/java/io/quarkus/ts/javaee/gettingstarted/GreetingHealthCheck.java b/javaee-like-getting-started/src/main/java/io/quarkus/ts/javaee/gettingstarted/GreetingHealthCheck.java index 380bff5251..7a4225e8bc 100644 --- a/javaee-like-getting-started/src/main/java/io/quarkus/ts/javaee/gettingstarted/GreetingHealthCheck.java +++ b/javaee-like-getting-started/src/main/java/io/quarkus/ts/javaee/gettingstarted/GreetingHealthCheck.java @@ -1,6 +1,6 @@ package io.quarkus.ts.javaee.gettingstarted; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.eclipse.microprofile.health.HealthCheck; import org.eclipse.microprofile.health.HealthCheckResponse; diff --git a/javaee-like-getting-started/src/main/java/io/quarkus/ts/javaee/gettingstarted/GreetingResource.java b/javaee-like-getting-started/src/main/java/io/quarkus/ts/javaee/gettingstarted/GreetingResource.java index 88691378e4..7cf245a3f3 100644 --- a/javaee-like-getting-started/src/main/java/io/quarkus/ts/javaee/gettingstarted/GreetingResource.java +++ b/javaee-like-getting-started/src/main/java/io/quarkus/ts/javaee/gettingstarted/GreetingResource.java @@ -1,9 +1,9 @@ package io.quarkus.ts.javaee.gettingstarted; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.eclipse.microprofile.metrics.annotation.Counted; diff --git a/javaee-like-getting-started/src/main/java/io/quarkus/ts/javaee/gettingstarted/InjectingScopedBeansResource.java b/javaee-like-getting-started/src/main/java/io/quarkus/ts/javaee/gettingstarted/InjectingScopedBeansResource.java index 48cdcfdeab..fedbd29204 100644 --- a/javaee-like-getting-started/src/main/java/io/quarkus/ts/javaee/gettingstarted/InjectingScopedBeansResource.java +++ b/javaee-like-getting-started/src/main/java/io/quarkus/ts/javaee/gettingstarted/InjectingScopedBeansResource.java @@ -1,13 +1,13 @@ package io.quarkus.ts.javaee.gettingstarted; -import javax.inject.Inject; -import javax.servlet.ServletContext; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +import jakarta.servlet.ServletContext; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpSession; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; @Path("/scopedbeans") public class InjectingScopedBeansResource { diff --git a/kamelet/src/main/java/io/quarkus/ts/kamelet/KameletResource.java b/kamelet/src/main/java/io/quarkus/ts/kamelet/KameletResource.java index d3c733e2e9..69ce0cea54 100644 --- a/kamelet/src/main/java/io/quarkus/ts/kamelet/KameletResource.java +++ b/kamelet/src/main/java/io/quarkus/ts/kamelet/KameletResource.java @@ -1,12 +1,12 @@ package io.quarkus.ts.kamelet; -import javax.inject.Inject; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.apache.camel.ConsumerTemplate; import org.apache.camel.FluentProducerTemplate; diff --git a/lifecycle-application/pom.xml b/lifecycle-application/pom.xml index db1b019df7..ef340be3c7 100644 --- a/lifecycle-application/pom.xml +++ b/lifecycle-application/pom.xml @@ -27,7 +27,8 @@ io.quarkus quarkus-spring-di - 2.7.6.Final-redhat-00006 + + 3.0.0.Alpha3 @@ -40,7 +41,8 @@ - 2.13.6.Final + + 3.0.0.Alpha3 diff --git a/lifecycle-application/src/main/java/io/quarkus/ts/lifecycle/ArgsResource.java b/lifecycle-application/src/main/java/io/quarkus/ts/lifecycle/ArgsResource.java index 33baf1b9e8..02cf26f0d4 100644 --- a/lifecycle-application/src/main/java/io/quarkus/ts/lifecycle/ArgsResource.java +++ b/lifecycle-application/src/main/java/io/quarkus/ts/lifecycle/ArgsResource.java @@ -3,11 +3,11 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import io.quarkus.runtime.annotations.CommandLineArguments; diff --git a/logging/jboss/src/main/java/io/quarkus/ts/logging/jboss/LogResource.java b/logging/jboss/src/main/java/io/quarkus/ts/logging/jboss/LogResource.java index 355e49bd9c..06d2164caa 100644 --- a/logging/jboss/src/main/java/io/quarkus/ts/logging/jboss/LogResource.java +++ b/logging/jboss/src/main/java/io/quarkus/ts/logging/jboss/LogResource.java @@ -1,11 +1,11 @@ package io.quarkus.ts.logging.jboss; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.QueryParam; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.QueryParam; import org.jboss.logging.Logger; diff --git a/messaging/amqp-reactive/src/main/java/io/quarkus/ts/messaging/amqpreactive/PriceConsumer.java b/messaging/amqp-reactive/src/main/java/io/quarkus/ts/messaging/amqpreactive/PriceConsumer.java index 8c71b97b66..b66e7cc339 100644 --- a/messaging/amqp-reactive/src/main/java/io/quarkus/ts/messaging/amqpreactive/PriceConsumer.java +++ b/messaging/amqp-reactive/src/main/java/io/quarkus/ts/messaging/amqpreactive/PriceConsumer.java @@ -3,7 +3,7 @@ import java.util.Queue; import java.util.concurrent.ConcurrentLinkedQueue; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.eclipse.microprofile.reactive.messaging.Incoming; import org.jboss.logging.Logger; diff --git a/messaging/amqp-reactive/src/main/java/io/quarkus/ts/messaging/amqpreactive/PriceProducer.java b/messaging/amqp-reactive/src/main/java/io/quarkus/ts/messaging/amqpreactive/PriceProducer.java index 1d8434cc36..dce08f64c9 100644 --- a/messaging/amqp-reactive/src/main/java/io/quarkus/ts/messaging/amqpreactive/PriceProducer.java +++ b/messaging/amqp-reactive/src/main/java/io/quarkus/ts/messaging/amqpreactive/PriceProducer.java @@ -2,7 +2,7 @@ import java.time.Duration; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.eclipse.microprofile.reactive.messaging.Outgoing; import org.jboss.logging.Logger; diff --git a/messaging/amqp-reactive/src/main/java/io/quarkus/ts/messaging/amqpreactive/PriceResource.java b/messaging/amqp-reactive/src/main/java/io/quarkus/ts/messaging/amqpreactive/PriceResource.java index b228c1263b..42270bd048 100644 --- a/messaging/amqp-reactive/src/main/java/io/quarkus/ts/messaging/amqpreactive/PriceResource.java +++ b/messaging/amqp-reactive/src/main/java/io/quarkus/ts/messaging/amqpreactive/PriceResource.java @@ -1,11 +1,11 @@ package io.quarkus.ts.messaging.amqpreactive; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; @Path("/") public class PriceResource { diff --git a/messaging/cloud-events/amqp-binary/src/main/java/io/quarkus/ts/messaging/cloudevents/amqpbinary/Consumer.java b/messaging/cloud-events/amqp-binary/src/main/java/io/quarkus/ts/messaging/cloudevents/amqpbinary/Consumer.java index c6b7324f0f..b6b630952b 100644 --- a/messaging/cloud-events/amqp-binary/src/main/java/io/quarkus/ts/messaging/cloudevents/amqpbinary/Consumer.java +++ b/messaging/cloud-events/amqp-binary/src/main/java/io/quarkus/ts/messaging/cloudevents/amqpbinary/Consumer.java @@ -4,7 +4,7 @@ import java.util.Objects; import java.util.concurrent.atomic.AtomicReference; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.eclipse.microprofile.reactive.messaging.Incoming; import org.eclipse.microprofile.reactive.messaging.Message; diff --git a/messaging/cloud-events/amqp-binary/src/main/java/io/quarkus/ts/messaging/cloudevents/amqpbinary/Producer.java b/messaging/cloud-events/amqp-binary/src/main/java/io/quarkus/ts/messaging/cloudevents/amqpbinary/Producer.java index d90fc05ccd..962f06cebd 100644 --- a/messaging/cloud-events/amqp-binary/src/main/java/io/quarkus/ts/messaging/cloudevents/amqpbinary/Producer.java +++ b/messaging/cloud-events/amqp-binary/src/main/java/io/quarkus/ts/messaging/cloudevents/amqpbinary/Producer.java @@ -3,7 +3,7 @@ import java.net.URI; import java.time.Duration; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.eclipse.microprofile.reactive.messaging.Message; import org.eclipse.microprofile.reactive.messaging.Outgoing; diff --git a/messaging/cloud-events/amqp-binary/src/main/java/io/quarkus/ts/messaging/cloudevents/amqpbinary/Resource.java b/messaging/cloud-events/amqp-binary/src/main/java/io/quarkus/ts/messaging/cloudevents/amqpbinary/Resource.java index 098f041adc..877f6caeee 100644 --- a/messaging/cloud-events/amqp-binary/src/main/java/io/quarkus/ts/messaging/cloudevents/amqpbinary/Resource.java +++ b/messaging/cloud-events/amqp-binary/src/main/java/io/quarkus/ts/messaging/cloudevents/amqpbinary/Resource.java @@ -1,11 +1,11 @@ package io.quarkus.ts.messaging.cloudevents.amqpbinary; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; @Path("/") public class Resource { diff --git a/messaging/cloud-events/amqp-json/src/main/java/io/quarkus/ts/messaging/cloudevents/amqpjson/Consumer.java b/messaging/cloud-events/amqp-json/src/main/java/io/quarkus/ts/messaging/cloudevents/amqpjson/Consumer.java index 04b6ebfeb2..464bb0265d 100644 --- a/messaging/cloud-events/amqp-json/src/main/java/io/quarkus/ts/messaging/cloudevents/amqpjson/Consumer.java +++ b/messaging/cloud-events/amqp-json/src/main/java/io/quarkus/ts/messaging/cloudevents/amqpjson/Consumer.java @@ -4,7 +4,7 @@ import java.util.Objects; import java.util.concurrent.atomic.AtomicReference; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.eclipse.microprofile.reactive.messaging.Incoming; import org.eclipse.microprofile.reactive.messaging.Message; diff --git a/messaging/cloud-events/amqp-json/src/main/java/io/quarkus/ts/messaging/cloudevents/amqpjson/Producer.java b/messaging/cloud-events/amqp-json/src/main/java/io/quarkus/ts/messaging/cloudevents/amqpjson/Producer.java index d9aa6b16c6..69dc811ad2 100644 --- a/messaging/cloud-events/amqp-json/src/main/java/io/quarkus/ts/messaging/cloudevents/amqpjson/Producer.java +++ b/messaging/cloud-events/amqp-json/src/main/java/io/quarkus/ts/messaging/cloudevents/amqpjson/Producer.java @@ -3,7 +3,7 @@ import java.net.URI; import java.time.Duration; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.eclipse.microprofile.reactive.messaging.Message; import org.eclipse.microprofile.reactive.messaging.Outgoing; diff --git a/messaging/cloud-events/amqp-json/src/main/java/io/quarkus/ts/messaging/cloudevents/amqpjson/Resource.java b/messaging/cloud-events/amqp-json/src/main/java/io/quarkus/ts/messaging/cloudevents/amqpjson/Resource.java index affe7a3319..a4f0cd5234 100644 --- a/messaging/cloud-events/amqp-json/src/main/java/io/quarkus/ts/messaging/cloudevents/amqpjson/Resource.java +++ b/messaging/cloud-events/amqp-json/src/main/java/io/quarkus/ts/messaging/cloudevents/amqpjson/Resource.java @@ -1,11 +1,11 @@ package io.quarkus.ts.messaging.cloudevents.amqpjson; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; @Path("/") public class Resource { diff --git a/messaging/infinispan-grpc-kafka/src/main/java/io/quarkus/ts/messaging/infinispan/grpc/kafka/InfinispanPopulated.java b/messaging/infinispan-grpc-kafka/src/main/java/io/quarkus/ts/messaging/infinispan/grpc/kafka/InfinispanPopulated.java index 15be908fc8..65644b164b 100644 --- a/messaging/infinispan-grpc-kafka/src/main/java/io/quarkus/ts/messaging/infinispan/grpc/kafka/InfinispanPopulated.java +++ b/messaging/infinispan-grpc-kafka/src/main/java/io/quarkus/ts/messaging/infinispan/grpc/kafka/InfinispanPopulated.java @@ -1,8 +1,8 @@ package io.quarkus.ts.messaging.infinispan.grpc.kafka; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.event.Observes; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.event.Observes; +import jakarta.inject.Inject; import org.infinispan.client.hotrod.RemoteCache; import org.infinispan.client.hotrod.RemoteCacheManager; diff --git a/messaging/infinispan-grpc-kafka/src/main/java/io/quarkus/ts/messaging/infinispan/grpc/kafka/books/Book.java b/messaging/infinispan-grpc-kafka/src/main/java/io/quarkus/ts/messaging/infinispan/grpc/kafka/books/Book.java index 7cc4af0425..ee1421b697 100644 --- a/messaging/infinispan-grpc-kafka/src/main/java/io/quarkus/ts/messaging/infinispan/grpc/kafka/books/Book.java +++ b/messaging/infinispan-grpc-kafka/src/main/java/io/quarkus/ts/messaging/infinispan/grpc/kafka/books/Book.java @@ -2,7 +2,7 @@ import java.util.Objects; -import javax.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotBlank; import org.infinispan.protostream.annotations.ProtoFactory; import org.infinispan.protostream.annotations.ProtoField; diff --git a/messaging/infinispan-grpc-kafka/src/main/java/io/quarkus/ts/messaging/infinispan/grpc/kafka/books/BookCacheInitializer.java b/messaging/infinispan-grpc-kafka/src/main/java/io/quarkus/ts/messaging/infinispan/grpc/kafka/books/BookCacheInitializer.java index 84f40f84c0..f207164acc 100644 --- a/messaging/infinispan-grpc-kafka/src/main/java/io/quarkus/ts/messaging/infinispan/grpc/kafka/books/BookCacheInitializer.java +++ b/messaging/infinispan-grpc-kafka/src/main/java/io/quarkus/ts/messaging/infinispan/grpc/kafka/books/BookCacheInitializer.java @@ -1,8 +1,8 @@ package io.quarkus.ts.messaging.infinispan.grpc.kafka.books; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.event.Observes; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.event.Observes; +import jakarta.inject.Inject; import org.infinispan.client.hotrod.RemoteCacheManager; import org.infinispan.commons.configuration.XMLStringConfiguration; diff --git a/messaging/infinispan-grpc-kafka/src/main/java/io/quarkus/ts/messaging/infinispan/grpc/kafka/books/BookResource.java b/messaging/infinispan-grpc-kafka/src/main/java/io/quarkus/ts/messaging/infinispan/grpc/kafka/books/BookResource.java index ff624f4644..3130ff97f4 100644 --- a/messaging/infinispan-grpc-kafka/src/main/java/io/quarkus/ts/messaging/infinispan/grpc/kafka/books/BookResource.java +++ b/messaging/infinispan-grpc-kafka/src/main/java/io/quarkus/ts/messaging/infinispan/grpc/kafka/books/BookResource.java @@ -1,14 +1,14 @@ package io.quarkus.ts.messaging.infinispan.grpc.kafka.books; -import javax.inject.Inject; -import javax.validation.Valid; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +import jakarta.validation.Valid; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.infinispan.client.hotrod.RemoteCache; diff --git a/messaging/infinispan-grpc-kafka/src/main/java/io/quarkus/ts/messaging/infinispan/grpc/kafka/greeting/GreetingResource.java b/messaging/infinispan-grpc-kafka/src/main/java/io/quarkus/ts/messaging/infinispan/grpc/kafka/greeting/GreetingResource.java index 2ab0b137bd..9ddcd46ff2 100644 --- a/messaging/infinispan-grpc-kafka/src/main/java/io/quarkus/ts/messaging/infinispan/grpc/kafka/greeting/GreetingResource.java +++ b/messaging/infinispan-grpc-kafka/src/main/java/io/quarkus/ts/messaging/infinispan/grpc/kafka/greeting/GreetingResource.java @@ -1,11 +1,11 @@ package io.quarkus.ts.messaging.infinispan.grpc.kafka.greeting; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import io.quarkus.example.blocking.GreeterGrpc; import io.quarkus.example.dto.HelloReply; diff --git a/messaging/infinispan-grpc-kafka/src/main/java/io/quarkus/ts/messaging/infinispan/grpc/kafka/prices/PriceConsumer.java b/messaging/infinispan-grpc-kafka/src/main/java/io/quarkus/ts/messaging/infinispan/grpc/kafka/prices/PriceConsumer.java index 6ff53893e0..628442147b 100644 --- a/messaging/infinispan-grpc-kafka/src/main/java/io/quarkus/ts/messaging/infinispan/grpc/kafka/prices/PriceConsumer.java +++ b/messaging/infinispan-grpc-kafka/src/main/java/io/quarkus/ts/messaging/infinispan/grpc/kafka/prices/PriceConsumer.java @@ -3,7 +3,7 @@ import java.util.Queue; import java.util.concurrent.ConcurrentLinkedQueue; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.eclipse.microprofile.reactive.messaging.Incoming; diff --git a/messaging/infinispan-grpc-kafka/src/main/java/io/quarkus/ts/messaging/infinispan/grpc/kafka/prices/PriceConverter.java b/messaging/infinispan-grpc-kafka/src/main/java/io/quarkus/ts/messaging/infinispan/grpc/kafka/prices/PriceConverter.java index 7e6219c6b1..66d36cf194 100644 --- a/messaging/infinispan-grpc-kafka/src/main/java/io/quarkus/ts/messaging/infinispan/grpc/kafka/prices/PriceConverter.java +++ b/messaging/infinispan-grpc-kafka/src/main/java/io/quarkus/ts/messaging/infinispan/grpc/kafka/prices/PriceConverter.java @@ -1,6 +1,6 @@ package io.quarkus.ts.messaging.infinispan.grpc.kafka.prices; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.eclipse.microprofile.reactive.messaging.Incoming; import org.eclipse.microprofile.reactive.messaging.Outgoing; diff --git a/messaging/infinispan-grpc-kafka/src/main/java/io/quarkus/ts/messaging/infinispan/grpc/kafka/prices/PriceGenerator.java b/messaging/infinispan-grpc-kafka/src/main/java/io/quarkus/ts/messaging/infinispan/grpc/kafka/prices/PriceGenerator.java index cf379c6c94..88ff698568 100644 --- a/messaging/infinispan-grpc-kafka/src/main/java/io/quarkus/ts/messaging/infinispan/grpc/kafka/prices/PriceGenerator.java +++ b/messaging/infinispan-grpc-kafka/src/main/java/io/quarkus/ts/messaging/infinispan/grpc/kafka/prices/PriceGenerator.java @@ -3,7 +3,7 @@ import java.time.Duration; import java.util.Random; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.eclipse.microprofile.reactive.messaging.Outgoing; diff --git a/messaging/infinispan-grpc-kafka/src/main/java/io/quarkus/ts/messaging/infinispan/grpc/kafka/prices/PriceResource.java b/messaging/infinispan-grpc-kafka/src/main/java/io/quarkus/ts/messaging/infinispan/grpc/kafka/prices/PriceResource.java index 9c6897729e..d3c62e2e63 100644 --- a/messaging/infinispan-grpc-kafka/src/main/java/io/quarkus/ts/messaging/infinispan/grpc/kafka/prices/PriceResource.java +++ b/messaging/infinispan-grpc-kafka/src/main/java/io/quarkus/ts/messaging/infinispan/grpc/kafka/prices/PriceResource.java @@ -1,10 +1,10 @@ package io.quarkus.ts.messaging.infinispan.grpc.kafka.prices; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; /** * A simple resource retrieving the in-memory "my-data-stream" and sending the items as server-sent events. diff --git a/messaging/infinispan-grpc-kafka/src/main/java/io/quarkus/ts/messaging/infinispan/grpc/kafka/providers/KafkaProviders.java b/messaging/infinispan-grpc-kafka/src/main/java/io/quarkus/ts/messaging/infinispan/grpc/kafka/providers/KafkaProviders.java index 7682ca52be..b8d019f9d1 100644 --- a/messaging/infinispan-grpc-kafka/src/main/java/io/quarkus/ts/messaging/infinispan/grpc/kafka/providers/KafkaProviders.java +++ b/messaging/infinispan-grpc-kafka/src/main/java/io/quarkus/ts/messaging/infinispan/grpc/kafka/providers/KafkaProviders.java @@ -2,7 +2,7 @@ import java.util.Properties; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.clients.producer.ProducerConfig; diff --git a/messaging/infinispan-grpc-kafka/src/main/java/io/quarkus/ts/messaging/infinispan/grpc/kafka/providers/SaslKafkaProvider.java b/messaging/infinispan-grpc-kafka/src/main/java/io/quarkus/ts/messaging/infinispan/grpc/kafka/providers/SaslKafkaProvider.java index 6ddc4e23c4..efc05f2ac8 100644 --- a/messaging/infinispan-grpc-kafka/src/main/java/io/quarkus/ts/messaging/infinispan/grpc/kafka/providers/SaslKafkaProvider.java +++ b/messaging/infinispan-grpc-kafka/src/main/java/io/quarkus/ts/messaging/infinispan/grpc/kafka/providers/SaslKafkaProvider.java @@ -3,9 +3,9 @@ import java.util.Collections; import java.util.Properties; -import javax.enterprise.inject.Produces; -import javax.inject.Named; -import javax.inject.Singleton; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Named; +import jakarta.inject.Singleton; import org.apache.kafka.clients.CommonClientConfigs; import org.apache.kafka.clients.admin.AdminClient; diff --git a/messaging/infinispan-grpc-kafka/src/main/java/io/quarkus/ts/messaging/infinispan/grpc/kafka/quickstart/GreetingCachedResource.java b/messaging/infinispan-grpc-kafka/src/main/java/io/quarkus/ts/messaging/infinispan/grpc/kafka/quickstart/GreetingCachedResource.java index 9ecc68b6f0..826768c8af 100644 --- a/messaging/infinispan-grpc-kafka/src/main/java/io/quarkus/ts/messaging/infinispan/grpc/kafka/quickstart/GreetingCachedResource.java +++ b/messaging/infinispan-grpc-kafka/src/main/java/io/quarkus/ts/messaging/infinispan/grpc/kafka/quickstart/GreetingCachedResource.java @@ -1,10 +1,10 @@ package io.quarkus.ts.messaging.infinispan.grpc.kafka.quickstart; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.infinispan.client.hotrod.RemoteCache; diff --git a/messaging/infinispan-grpc-kafka/src/main/java/io/quarkus/ts/messaging/infinispan/grpc/kafka/quickstart/SaslKafkaEndpoint.java b/messaging/infinispan-grpc-kafka/src/main/java/io/quarkus/ts/messaging/infinispan/grpc/kafka/quickstart/SaslKafkaEndpoint.java index ab0df52d69..7b8148075d 100644 --- a/messaging/infinispan-grpc-kafka/src/main/java/io/quarkus/ts/messaging/infinispan/grpc/kafka/quickstart/SaslKafkaEndpoint.java +++ b/messaging/infinispan-grpc-kafka/src/main/java/io/quarkus/ts/messaging/infinispan/grpc/kafka/quickstart/SaslKafkaEndpoint.java @@ -4,16 +4,16 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeoutException; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.event.Observes; -import javax.inject.Inject; -import javax.inject.Named; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.event.Observes; +import jakarta.inject.Inject; +import jakarta.inject.Named; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; import org.apache.kafka.clients.admin.AdminClient; import org.apache.kafka.clients.consumer.KafkaConsumer; diff --git a/messaging/kafka-confluent-avro-reactive-messaging/src/main/java/io/quarkus/ts/messaging/kafka/KStockPriceConsumer.java b/messaging/kafka-confluent-avro-reactive-messaging/src/main/java/io/quarkus/ts/messaging/kafka/KStockPriceConsumer.java index fbaab9450c..8d140da555 100644 --- a/messaging/kafka-confluent-avro-reactive-messaging/src/main/java/io/quarkus/ts/messaging/kafka/KStockPriceConsumer.java +++ b/messaging/kafka-confluent-avro-reactive-messaging/src/main/java/io/quarkus/ts/messaging/kafka/KStockPriceConsumer.java @@ -3,7 +3,7 @@ import java.util.List; import java.util.stream.Collectors; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.eclipse.microprofile.reactive.messaging.Incoming; import org.eclipse.microprofile.reactive.messaging.Outgoing; diff --git a/messaging/kafka-confluent-avro-reactive-messaging/src/main/java/io/quarkus/ts/messaging/kafka/KStockPriceProducer.java b/messaging/kafka-confluent-avro-reactive-messaging/src/main/java/io/quarkus/ts/messaging/kafka/KStockPriceProducer.java index 154f24f3a8..3d4f2c689c 100644 --- a/messaging/kafka-confluent-avro-reactive-messaging/src/main/java/io/quarkus/ts/messaging/kafka/KStockPriceProducer.java +++ b/messaging/kafka-confluent-avro-reactive-messaging/src/main/java/io/quarkus/ts/messaging/kafka/KStockPriceProducer.java @@ -7,8 +7,8 @@ import java.util.function.BiConsumer; import java.util.stream.IntStream; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.eclipse.microprofile.reactive.messaging.Channel; import org.eclipse.microprofile.reactive.messaging.Emitter; diff --git a/messaging/kafka-confluent-avro-reactive-messaging/src/main/java/io/quarkus/ts/messaging/kafka/StockPriceEndpoint.java b/messaging/kafka-confluent-avro-reactive-messaging/src/main/java/io/quarkus/ts/messaging/kafka/StockPriceEndpoint.java index 0e31d666d5..b25fc7b710 100644 --- a/messaging/kafka-confluent-avro-reactive-messaging/src/main/java/io/quarkus/ts/messaging/kafka/StockPriceEndpoint.java +++ b/messaging/kafka-confluent-avro-reactive-messaging/src/main/java/io/quarkus/ts/messaging/kafka/StockPriceEndpoint.java @@ -2,13 +2,13 @@ import java.util.List; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import org.eclipse.microprofile.reactive.messaging.Channel; import org.eclipse.microprofile.reactive.messaging.Emitter; diff --git a/messaging/kafka-confluent-avro-reactive-messaging/src/test/java/io/quarkus/ts/messaging/kafka/BaseKafkaAvroGroupIdIT.java b/messaging/kafka-confluent-avro-reactive-messaging/src/test/java/io/quarkus/ts/messaging/kafka/BaseKafkaAvroGroupIdIT.java index 84f2fac5ee..e02100c745 100644 --- a/messaging/kafka-confluent-avro-reactive-messaging/src/test/java/io/quarkus/ts/messaging/kafka/BaseKafkaAvroGroupIdIT.java +++ b/messaging/kafka-confluent-avro-reactive-messaging/src/test/java/io/quarkus/ts/messaging/kafka/BaseKafkaAvroGroupIdIT.java @@ -12,11 +12,11 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.stream.IntStream; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.ClientBuilder; -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.sse.SseEventSource; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.ClientBuilder; +import jakarta.ws.rs.client.WebTarget; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.sse.SseEventSource; import org.junit.jupiter.api.Test; diff --git a/messaging/kafka-confluent-avro-reactive-messaging/src/test/java/io/quarkus/ts/messaging/kafka/BaseKafkaAvroIT.java b/messaging/kafka-confluent-avro-reactive-messaging/src/test/java/io/quarkus/ts/messaging/kafka/BaseKafkaAvroIT.java index 029ed98c6a..c595826306 100644 --- a/messaging/kafka-confluent-avro-reactive-messaging/src/test/java/io/quarkus/ts/messaging/kafka/BaseKafkaAvroIT.java +++ b/messaging/kafka-confluent-avro-reactive-messaging/src/test/java/io/quarkus/ts/messaging/kafka/BaseKafkaAvroIT.java @@ -6,11 +6,11 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.ClientBuilder; -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.sse.SseEventSource; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.ClientBuilder; +import jakarta.ws.rs.client.WebTarget; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.sse.SseEventSource; import org.junit.jupiter.api.Test; diff --git a/messaging/kafka-producer/src/main/java/io/quarkus/ts/messaging/kafka/producer/Application.java b/messaging/kafka-producer/src/main/java/io/quarkus/ts/messaging/kafka/producer/Application.java index ea8d6d8124..754ea26e3f 100644 --- a/messaging/kafka-producer/src/main/java/io/quarkus/ts/messaging/kafka/producer/Application.java +++ b/messaging/kafka-producer/src/main/java/io/quarkus/ts/messaging/kafka/producer/Application.java @@ -1,8 +1,8 @@ package io.quarkus.ts.messaging.kafka.producer; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.event.Observes; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.event.Observes; +import jakarta.inject.Inject; import org.eclipse.microprofile.config.inject.ConfigProperty; import org.jboss.logging.Logger; diff --git a/messaging/kafka-producer/src/main/java/io/quarkus/ts/messaging/kafka/producer/FailureHandler.java b/messaging/kafka-producer/src/main/java/io/quarkus/ts/messaging/kafka/producer/FailureHandler.java index 94ad2e19c5..109375814a 100644 --- a/messaging/kafka-producer/src/main/java/io/quarkus/ts/messaging/kafka/producer/FailureHandler.java +++ b/messaging/kafka-producer/src/main/java/io/quarkus/ts/messaging/kafka/producer/FailureHandler.java @@ -1,6 +1,6 @@ package io.quarkus.ts.messaging.kafka.producer; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import io.netty.handler.codec.http.HttpResponseStatus; import io.vertx.core.json.JsonObject; diff --git a/messaging/kafka-producer/src/main/java/io/quarkus/ts/messaging/kafka/producer/KafkaBlockingProducer.java b/messaging/kafka-producer/src/main/java/io/quarkus/ts/messaging/kafka/producer/KafkaBlockingProducer.java index 8f4addb059..35e9301882 100644 --- a/messaging/kafka-producer/src/main/java/io/quarkus/ts/messaging/kafka/producer/KafkaBlockingProducer.java +++ b/messaging/kafka-producer/src/main/java/io/quarkus/ts/messaging/kafka/producer/KafkaBlockingProducer.java @@ -6,8 +6,8 @@ import java.util.function.Function; import java.util.function.Supplier; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.eclipse.microprofile.reactive.messaging.Channel; import org.eclipse.microprofile.reactive.messaging.Message; diff --git a/messaging/kafka-streams-reactive-messaging/src/main/java/io/quarkus/ts/messaging/kafka/reactive/streams/aggregator/rest/AlertMonitor.java b/messaging/kafka-streams-reactive-messaging/src/main/java/io/quarkus/ts/messaging/kafka/reactive/streams/aggregator/rest/AlertMonitor.java index 54ddbee15c..9e4e42ff4e 100644 --- a/messaging/kafka-streams-reactive-messaging/src/main/java/io/quarkus/ts/messaging/kafka/reactive/streams/aggregator/rest/AlertMonitor.java +++ b/messaging/kafka-streams-reactive-messaging/src/main/java/io/quarkus/ts/messaging/kafka/reactive/streams/aggregator/rest/AlertMonitor.java @@ -1,10 +1,10 @@ package io.quarkus.ts.messaging.kafka.reactive.streams.aggregator.rest; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.eclipse.microprofile.reactive.messaging.Channel; import org.jboss.resteasy.annotations.SseElementType; diff --git a/messaging/kafka-streams-reactive-messaging/src/main/java/io/quarkus/ts/messaging/kafka/reactive/streams/aggregator/streams/WindowedLoginDeniedStream.java b/messaging/kafka-streams-reactive-messaging/src/main/java/io/quarkus/ts/messaging/kafka/reactive/streams/aggregator/streams/WindowedLoginDeniedStream.java index 3857195203..1ee1c04030 100644 --- a/messaging/kafka-streams-reactive-messaging/src/main/java/io/quarkus/ts/messaging/kafka/reactive/streams/aggregator/streams/WindowedLoginDeniedStream.java +++ b/messaging/kafka-streams-reactive-messaging/src/main/java/io/quarkus/ts/messaging/kafka/reactive/streams/aggregator/streams/WindowedLoginDeniedStream.java @@ -1,13 +1,13 @@ package io.quarkus.ts.messaging.kafka.reactive.streams.aggregator.streams; -import static javax.ws.rs.core.Response.Status.FORBIDDEN; -import static javax.ws.rs.core.Response.Status.UNAUTHORIZED; +import static jakarta.ws.rs.core.Response.Status.FORBIDDEN; +import static jakarta.ws.rs.core.Response.Status.UNAUTHORIZED; import java.time.Duration; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Produces; -import javax.inject.Singleton; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Singleton; import org.apache.kafka.common.serialization.Serdes; import org.apache.kafka.common.utils.Bytes; diff --git a/messaging/kafka-streams-reactive-messaging/src/main/java/io/quarkus/ts/messaging/kafka/reactive/streams/producer/EventsProducer.java b/messaging/kafka-streams-reactive-messaging/src/main/java/io/quarkus/ts/messaging/kafka/reactive/streams/producer/EventsProducer.java index 482f02f3ff..1779ba0840 100644 --- a/messaging/kafka-streams-reactive-messaging/src/main/java/io/quarkus/ts/messaging/kafka/reactive/streams/producer/EventsProducer.java +++ b/messaging/kafka-streams-reactive-messaging/src/main/java/io/quarkus/ts/messaging/kafka/reactive/streams/producer/EventsProducer.java @@ -5,7 +5,7 @@ import java.util.List; import java.util.Random; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.eclipse.microprofile.config.inject.ConfigProperty; import org.eclipse.microprofile.reactive.messaging.Outgoing; diff --git a/messaging/kafka-streams-reactive-messaging/src/main/java/io/quarkus/ts/messaging/kafka/reactive/streams/shutdown/SlowTopicConsumer.java b/messaging/kafka-streams-reactive-messaging/src/main/java/io/quarkus/ts/messaging/kafka/reactive/streams/shutdown/SlowTopicConsumer.java index d1ed99e62e..85c08a9958 100644 --- a/messaging/kafka-streams-reactive-messaging/src/main/java/io/quarkus/ts/messaging/kafka/reactive/streams/shutdown/SlowTopicConsumer.java +++ b/messaging/kafka-streams-reactive-messaging/src/main/java/io/quarkus/ts/messaging/kafka/reactive/streams/shutdown/SlowTopicConsumer.java @@ -2,7 +2,7 @@ import java.util.concurrent.CompletionStage; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.eclipse.microprofile.reactive.messaging.Acknowledgment; import org.eclipse.microprofile.reactive.messaging.Incoming; diff --git a/messaging/kafka-streams-reactive-messaging/src/main/java/io/quarkus/ts/messaging/kafka/reactive/streams/shutdown/SlowTopicResource.java b/messaging/kafka-streams-reactive-messaging/src/main/java/io/quarkus/ts/messaging/kafka/reactive/streams/shutdown/SlowTopicResource.java index 74dcbb417f..c56dc511ae 100644 --- a/messaging/kafka-streams-reactive-messaging/src/main/java/io/quarkus/ts/messaging/kafka/reactive/streams/shutdown/SlowTopicResource.java +++ b/messaging/kafka-streams-reactive-messaging/src/main/java/io/quarkus/ts/messaging/kafka/reactive/streams/shutdown/SlowTopicResource.java @@ -1,9 +1,9 @@ package io.quarkus.ts.messaging.kafka.reactive.streams.shutdown; -import javax.inject.Inject; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; +import jakarta.inject.Inject; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; import org.eclipse.microprofile.reactive.messaging.Channel; import org.eclipse.microprofile.reactive.messaging.Emitter; diff --git a/messaging/kafka-streams-reactive-messaging/src/test/java/io/quarkus/ts/messaging/kafka/reactive/streams/BaseKafkaStreamTest.java b/messaging/kafka-streams-reactive-messaging/src/test/java/io/quarkus/ts/messaging/kafka/reactive/streams/BaseKafkaStreamTest.java index 78d4e6983a..0b112e19a7 100644 --- a/messaging/kafka-streams-reactive-messaging/src/test/java/io/quarkus/ts/messaging/kafka/reactive/streams/BaseKafkaStreamTest.java +++ b/messaging/kafka-streams-reactive-messaging/src/test/java/io/quarkus/ts/messaging/kafka/reactive/streams/BaseKafkaStreamTest.java @@ -6,10 +6,10 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.ClientBuilder; -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.sse.SseEventSource; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.ClientBuilder; +import jakarta.ws.rs.client.WebTarget; +import jakarta.ws.rs.sse.SseEventSource; import org.junit.jupiter.api.Test; diff --git a/messaging/kafka-strimzi-avro-reactive-messaging/src/main/java/io/quarkus/ts/messaging/strimzi/kafka/reactive/KStockPriceConsumer.java b/messaging/kafka-strimzi-avro-reactive-messaging/src/main/java/io/quarkus/ts/messaging/strimzi/kafka/reactive/KStockPriceConsumer.java index 9903d548a0..5c3ebf58f6 100644 --- a/messaging/kafka-strimzi-avro-reactive-messaging/src/main/java/io/quarkus/ts/messaging/strimzi/kafka/reactive/KStockPriceConsumer.java +++ b/messaging/kafka-strimzi-avro-reactive-messaging/src/main/java/io/quarkus/ts/messaging/strimzi/kafka/reactive/KStockPriceConsumer.java @@ -3,7 +3,7 @@ import java.util.List; import java.util.stream.Collectors; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.eclipse.microprofile.reactive.messaging.Incoming; import org.eclipse.microprofile.reactive.messaging.Outgoing; diff --git a/messaging/kafka-strimzi-avro-reactive-messaging/src/main/java/io/quarkus/ts/messaging/strimzi/kafka/reactive/KStockPriceProducer.java b/messaging/kafka-strimzi-avro-reactive-messaging/src/main/java/io/quarkus/ts/messaging/strimzi/kafka/reactive/KStockPriceProducer.java index 33ee4e7bc1..afca30832b 100644 --- a/messaging/kafka-strimzi-avro-reactive-messaging/src/main/java/io/quarkus/ts/messaging/strimzi/kafka/reactive/KStockPriceProducer.java +++ b/messaging/kafka-strimzi-avro-reactive-messaging/src/main/java/io/quarkus/ts/messaging/strimzi/kafka/reactive/KStockPriceProducer.java @@ -7,8 +7,8 @@ import java.util.function.BiConsumer; import java.util.stream.IntStream; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.eclipse.microprofile.reactive.messaging.Channel; import org.eclipse.microprofile.reactive.messaging.Emitter; diff --git a/messaging/kafka-strimzi-avro-reactive-messaging/src/main/java/io/quarkus/ts/messaging/strimzi/kafka/reactive/StockPriceEndpoint.java b/messaging/kafka-strimzi-avro-reactive-messaging/src/main/java/io/quarkus/ts/messaging/strimzi/kafka/reactive/StockPriceEndpoint.java index aeeac86d10..8a1332775a 100644 --- a/messaging/kafka-strimzi-avro-reactive-messaging/src/main/java/io/quarkus/ts/messaging/strimzi/kafka/reactive/StockPriceEndpoint.java +++ b/messaging/kafka-strimzi-avro-reactive-messaging/src/main/java/io/quarkus/ts/messaging/strimzi/kafka/reactive/StockPriceEndpoint.java @@ -2,13 +2,13 @@ import java.util.List; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import org.eclipse.microprofile.reactive.messaging.Channel; import org.eclipse.microprofile.reactive.messaging.Emitter; diff --git a/messaging/kafka-strimzi-avro-reactive-messaging/src/test/java/io/quarkus/ts/messaging/strimzi/kafka/reactive/BaseKafkaAvroGroupIdIT.java b/messaging/kafka-strimzi-avro-reactive-messaging/src/test/java/io/quarkus/ts/messaging/strimzi/kafka/reactive/BaseKafkaAvroGroupIdIT.java index 983355bcaf..026e48380f 100644 --- a/messaging/kafka-strimzi-avro-reactive-messaging/src/test/java/io/quarkus/ts/messaging/strimzi/kafka/reactive/BaseKafkaAvroGroupIdIT.java +++ b/messaging/kafka-strimzi-avro-reactive-messaging/src/test/java/io/quarkus/ts/messaging/strimzi/kafka/reactive/BaseKafkaAvroGroupIdIT.java @@ -12,11 +12,11 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.stream.IntStream; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.ClientBuilder; -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.sse.SseEventSource; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.ClientBuilder; +import jakarta.ws.rs.client.WebTarget; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.sse.SseEventSource; import org.junit.jupiter.api.Test; diff --git a/messaging/kafka-strimzi-avro-reactive-messaging/src/test/java/io/quarkus/ts/messaging/strimzi/kafka/reactive/BaseKafkaAvroIT.java b/messaging/kafka-strimzi-avro-reactive-messaging/src/test/java/io/quarkus/ts/messaging/strimzi/kafka/reactive/BaseKafkaAvroIT.java index 873ae699f5..1959f3e0c4 100644 --- a/messaging/kafka-strimzi-avro-reactive-messaging/src/test/java/io/quarkus/ts/messaging/strimzi/kafka/reactive/BaseKafkaAvroIT.java +++ b/messaging/kafka-strimzi-avro-reactive-messaging/src/test/java/io/quarkus/ts/messaging/strimzi/kafka/reactive/BaseKafkaAvroIT.java @@ -6,11 +6,11 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.ClientBuilder; -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.sse.SseEventSource; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.ClientBuilder; +import jakarta.ws.rs.client.WebTarget; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.sse.SseEventSource; import org.junit.jupiter.api.Test; diff --git a/messaging/kafkaSSL/src/main/java/io/quarkus/qe/messaging/ssl/providers/KafkaProviders.java b/messaging/kafkaSSL/src/main/java/io/quarkus/qe/messaging/ssl/providers/KafkaProviders.java index ead8d01f7b..eddc1b25cb 100644 --- a/messaging/kafkaSSL/src/main/java/io/quarkus/qe/messaging/ssl/providers/KafkaProviders.java +++ b/messaging/kafkaSSL/src/main/java/io/quarkus/qe/messaging/ssl/providers/KafkaProviders.java @@ -2,7 +2,7 @@ import java.util.Properties; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.clients.producer.ProducerConfig; diff --git a/messaging/kafkaSSL/src/main/java/io/quarkus/qe/messaging/ssl/providers/SslKafkaProvider.java b/messaging/kafkaSSL/src/main/java/io/quarkus/qe/messaging/ssl/providers/SslKafkaProvider.java index b3e1cae362..01738f3b8b 100644 --- a/messaging/kafkaSSL/src/main/java/io/quarkus/qe/messaging/ssl/providers/SslKafkaProvider.java +++ b/messaging/kafkaSSL/src/main/java/io/quarkus/qe/messaging/ssl/providers/SslKafkaProvider.java @@ -4,9 +4,9 @@ import java.util.Collections; import java.util.Properties; -import javax.enterprise.inject.Produces; -import javax.inject.Named; -import javax.inject.Singleton; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Named; +import jakarta.inject.Singleton; import org.apache.kafka.clients.CommonClientConfigs; import org.apache.kafka.clients.admin.AdminClient; diff --git a/messaging/kafkaSSL/src/main/java/io/quarkus/qe/messaging/ssl/quickstart/SslKafkaEndpoint.java b/messaging/kafkaSSL/src/main/java/io/quarkus/qe/messaging/ssl/quickstart/SslKafkaEndpoint.java index 4193a90324..62a53a9269 100644 --- a/messaging/kafkaSSL/src/main/java/io/quarkus/qe/messaging/ssl/quickstart/SslKafkaEndpoint.java +++ b/messaging/kafkaSSL/src/main/java/io/quarkus/qe/messaging/ssl/quickstart/SslKafkaEndpoint.java @@ -4,17 +4,17 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeoutException; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.event.Observes; -import javax.inject.Inject; -import javax.inject.Named; -import javax.inject.Provider; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.event.Observes; +import jakarta.inject.Inject; +import jakarta.inject.Named; +import jakarta.inject.Provider; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; import org.apache.kafka.clients.admin.AdminClient; import org.apache.kafka.clients.consumer.KafkaConsumer; diff --git a/messaging/qpid/src/main/java/io/quarkus/ts/messaging/qpid/PriceConsumer.java b/messaging/qpid/src/main/java/io/quarkus/ts/messaging/qpid/PriceConsumer.java index fc86585faf..96d21eab9d 100644 --- a/messaging/qpid/src/main/java/io/quarkus/ts/messaging/qpid/PriceConsumer.java +++ b/messaging/qpid/src/main/java/io/quarkus/ts/messaging/qpid/PriceConsumer.java @@ -1,7 +1,8 @@ package io.quarkus.ts.messaging.qpid; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; + import javax.jms.ConnectionFactory; import javax.jms.JMSConsumer; import javax.jms.JMSContext; diff --git a/messaging/qpid/src/main/java/io/quarkus/ts/messaging/qpid/PriceProducer.java b/messaging/qpid/src/main/java/io/quarkus/ts/messaging/qpid/PriceProducer.java index f47dd1380e..be82f6294c 100644 --- a/messaging/qpid/src/main/java/io/quarkus/ts/messaging/qpid/PriceProducer.java +++ b/messaging/qpid/src/main/java/io/quarkus/ts/messaging/qpid/PriceProducer.java @@ -5,15 +5,16 @@ import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.event.Observes; -import javax.jms.ConnectionFactory; -import javax.jms.JMSContext; -import javax.jms.Session; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.event.Observes; import io.quarkus.runtime.ShutdownEvent; import io.quarkus.runtime.StartupEvent; +import javax.jms.ConnectionFactory; +import javax.jms.JMSContext; +import javax.jms.Session; + /** * https://quarkus.io/guides/jms#qpid-jms-amqp. */ diff --git a/messaging/qpid/src/main/java/io/quarkus/ts/messaging/qpid/PriceResource.java b/messaging/qpid/src/main/java/io/quarkus/ts/messaging/qpid/PriceResource.java index 8bf936612f..022f37e2a8 100644 --- a/messaging/qpid/src/main/java/io/quarkus/ts/messaging/qpid/PriceResource.java +++ b/messaging/qpid/src/main/java/io/quarkus/ts/messaging/qpid/PriceResource.java @@ -1,10 +1,10 @@ package io.quarkus.ts.messaging.qpid; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; /** * https://quarkus.io/guides/jms#qpid-jms-amqp. diff --git a/monitoring/micrometer-prometheus-kafka-reactive/src/main/java/io/quarkus/ts/micrometer/prometheus/kafka/reactive/AlertBroadcast.java b/monitoring/micrometer-prometheus-kafka-reactive/src/main/java/io/quarkus/ts/micrometer/prometheus/kafka/reactive/AlertBroadcast.java index acb45f83c5..afc2517918 100644 --- a/monitoring/micrometer-prometheus-kafka-reactive/src/main/java/io/quarkus/ts/micrometer/prometheus/kafka/reactive/AlertBroadcast.java +++ b/monitoring/micrometer-prometheus-kafka-reactive/src/main/java/io/quarkus/ts/micrometer/prometheus/kafka/reactive/AlertBroadcast.java @@ -1,6 +1,6 @@ package io.quarkus.ts.micrometer.prometheus.kafka.reactive; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.eclipse.microprofile.reactive.messaging.Acknowledgment; import org.eclipse.microprofile.reactive.messaging.Incoming; diff --git a/monitoring/micrometer-prometheus-kafka-reactive/src/main/java/io/quarkus/ts/micrometer/prometheus/kafka/reactive/AlertConsumer.java b/monitoring/micrometer-prometheus-kafka-reactive/src/main/java/io/quarkus/ts/micrometer/prometheus/kafka/reactive/AlertConsumer.java index aaa1de6bbf..ffee9eb578 100644 --- a/monitoring/micrometer-prometheus-kafka-reactive/src/main/java/io/quarkus/ts/micrometer/prometheus/kafka/reactive/AlertConsumer.java +++ b/monitoring/micrometer-prometheus-kafka-reactive/src/main/java/io/quarkus/ts/micrometer/prometheus/kafka/reactive/AlertConsumer.java @@ -1,10 +1,10 @@ package io.quarkus.ts.micrometer.prometheus.kafka.reactive; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.eclipse.microprofile.reactive.messaging.Channel; import org.jboss.resteasy.reactive.RestSseElementType; diff --git a/monitoring/micrometer-prometheus-kafka-reactive/src/main/java/io/quarkus/ts/micrometer/prometheus/kafka/reactive/AlertProducer.java b/monitoring/micrometer-prometheus-kafka-reactive/src/main/java/io/quarkus/ts/micrometer/prometheus/kafka/reactive/AlertProducer.java index 68fcd33956..15d5fe118c 100644 --- a/monitoring/micrometer-prometheus-kafka-reactive/src/main/java/io/quarkus/ts/micrometer/prometheus/kafka/reactive/AlertProducer.java +++ b/monitoring/micrometer-prometheus-kafka-reactive/src/main/java/io/quarkus/ts/micrometer/prometheus/kafka/reactive/AlertProducer.java @@ -2,7 +2,7 @@ import java.time.Duration; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.eclipse.microprofile.reactive.messaging.Outgoing; diff --git a/monitoring/micrometer-prometheus-kafka-reactive/src/test/java/io/quarkus/ts/micrometer/prometheus/kafka/reactive/BaseOpenShiftAlertEventsReactiveIT.java b/monitoring/micrometer-prometheus-kafka-reactive/src/test/java/io/quarkus/ts/micrometer/prometheus/kafka/reactive/BaseOpenShiftAlertEventsReactiveIT.java index 503d69851a..8e652697ec 100644 --- a/monitoring/micrometer-prometheus-kafka-reactive/src/test/java/io/quarkus/ts/micrometer/prometheus/kafka/reactive/BaseOpenShiftAlertEventsReactiveIT.java +++ b/monitoring/micrometer-prometheus-kafka-reactive/src/test/java/io/quarkus/ts/micrometer/prometheus/kafka/reactive/BaseOpenShiftAlertEventsReactiveIT.java @@ -11,11 +11,11 @@ import java.util.concurrent.TimeUnit; import java.util.function.Predicate; -import javax.inject.Inject; -import javax.ws.rs.client.ClientBuilder; -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.sse.SseEventSource; +import jakarta.inject.Inject; +import jakarta.ws.rs.client.ClientBuilder; +import jakarta.ws.rs.client.WebTarget; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.sse.SseEventSource; import org.apache.http.HttpStatus; import org.apache.logging.log4j.util.Strings; diff --git a/monitoring/micrometer-prometheus-kafka/src/main/java/io/quarkus/ts/micrometer/prometheus/kafka/AlertBroadcast.java b/monitoring/micrometer-prometheus-kafka/src/main/java/io/quarkus/ts/micrometer/prometheus/kafka/AlertBroadcast.java index 853593d41b..95bd6874ac 100644 --- a/monitoring/micrometer-prometheus-kafka/src/main/java/io/quarkus/ts/micrometer/prometheus/kafka/AlertBroadcast.java +++ b/monitoring/micrometer-prometheus-kafka/src/main/java/io/quarkus/ts/micrometer/prometheus/kafka/AlertBroadcast.java @@ -1,6 +1,6 @@ package io.quarkus.ts.micrometer.prometheus.kafka; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.eclipse.microprofile.reactive.messaging.Acknowledgment; import org.eclipse.microprofile.reactive.messaging.Incoming; diff --git a/monitoring/micrometer-prometheus-kafka/src/main/java/io/quarkus/ts/micrometer/prometheus/kafka/AlertConsumer.java b/monitoring/micrometer-prometheus-kafka/src/main/java/io/quarkus/ts/micrometer/prometheus/kafka/AlertConsumer.java index 626512d9ec..8080ccb8b0 100644 --- a/monitoring/micrometer-prometheus-kafka/src/main/java/io/quarkus/ts/micrometer/prometheus/kafka/AlertConsumer.java +++ b/monitoring/micrometer-prometheus-kafka/src/main/java/io/quarkus/ts/micrometer/prometheus/kafka/AlertConsumer.java @@ -1,10 +1,10 @@ package io.quarkus.ts.micrometer.prometheus.kafka; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.eclipse.microprofile.reactive.messaging.Channel; import org.jboss.resteasy.annotations.SseElementType; diff --git a/monitoring/micrometer-prometheus-kafka/src/main/java/io/quarkus/ts/micrometer/prometheus/kafka/AlertProducer.java b/monitoring/micrometer-prometheus-kafka/src/main/java/io/quarkus/ts/micrometer/prometheus/kafka/AlertProducer.java index c24627338b..238c612ef6 100644 --- a/monitoring/micrometer-prometheus-kafka/src/main/java/io/quarkus/ts/micrometer/prometheus/kafka/AlertProducer.java +++ b/monitoring/micrometer-prometheus-kafka/src/main/java/io/quarkus/ts/micrometer/prometheus/kafka/AlertProducer.java @@ -2,7 +2,7 @@ import java.time.Duration; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.eclipse.microprofile.reactive.messaging.Outgoing; diff --git a/monitoring/micrometer-prometheus-kafka/src/test/java/io/quarkus/ts/micrometer/prometheus/kafka/BaseOpenShiftAlertEventsIT.java b/monitoring/micrometer-prometheus-kafka/src/test/java/io/quarkus/ts/micrometer/prometheus/kafka/BaseOpenShiftAlertEventsIT.java index 9a24e1b422..8d037cb923 100644 --- a/monitoring/micrometer-prometheus-kafka/src/test/java/io/quarkus/ts/micrometer/prometheus/kafka/BaseOpenShiftAlertEventsIT.java +++ b/monitoring/micrometer-prometheus-kafka/src/test/java/io/quarkus/ts/micrometer/prometheus/kafka/BaseOpenShiftAlertEventsIT.java @@ -11,11 +11,11 @@ import java.util.concurrent.TimeUnit; import java.util.function.Predicate; -import javax.inject.Inject; -import javax.ws.rs.client.ClientBuilder; -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.sse.SseEventSource; +import jakarta.inject.Inject; +import jakarta.ws.rs.client.ClientBuilder; +import jakarta.ws.rs.client.WebTarget; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.sse.SseEventSource; import org.apache.http.HttpStatus; import org.apache.logging.log4j.util.Strings; diff --git a/monitoring/micrometer-prometheus-oidc/src/main/java/io/quarkus/ts/micrometer/oidc/UserResource.java b/monitoring/micrometer-prometheus-oidc/src/main/java/io/quarkus/ts/micrometer/oidc/UserResource.java index 087ad1c4de..c22dc60afe 100644 --- a/monitoring/micrometer-prometheus-oidc/src/main/java/io/quarkus/ts/micrometer/oidc/UserResource.java +++ b/monitoring/micrometer-prometheus-oidc/src/main/java/io/quarkus/ts/micrometer/oidc/UserResource.java @@ -1,10 +1,10 @@ package io.quarkus.ts.micrometer.oidc; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import io.quarkus.security.Authenticated; import io.quarkus.security.identity.SecurityIdentity; diff --git a/monitoring/micrometer-prometheus/src/main/java/io/quarkus/ts/micrometer/prometheus/PrimeNumberResource.java b/monitoring/micrometer-prometheus/src/main/java/io/quarkus/ts/micrometer/prometheus/PrimeNumberResource.java index caa4436a5c..83ec36a7b7 100644 --- a/monitoring/micrometer-prometheus/src/main/java/io/quarkus/ts/micrometer/prometheus/PrimeNumberResource.java +++ b/monitoring/micrometer-prometheus/src/main/java/io/quarkus/ts/micrometer/prometheus/PrimeNumberResource.java @@ -4,11 +4,11 @@ import java.util.concurrent.atomic.LongAccumulator; import java.util.function.Supplier; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import io.micrometer.core.instrument.MeterRegistry; diff --git a/monitoring/micrometer-prometheus/src/main/java/io/quarkus/ts/micrometer/prometheus/UsingMicroProfilePingPongResource.java b/monitoring/micrometer-prometheus/src/main/java/io/quarkus/ts/micrometer/prometheus/UsingMicroProfilePingPongResource.java index b7bb7d72dc..88185b8e43 100644 --- a/monitoring/micrometer-prometheus/src/main/java/io/quarkus/ts/micrometer/prometheus/UsingMicroProfilePingPongResource.java +++ b/monitoring/micrometer-prometheus/src/main/java/io/quarkus/ts/micrometer/prometheus/UsingMicroProfilePingPongResource.java @@ -1,10 +1,10 @@ package io.quarkus.ts.micrometer.prometheus; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; import org.eclipse.microprofile.metrics.MetricUnits; import org.eclipse.microprofile.metrics.annotation.Counted; diff --git a/monitoring/micrometer-prometheus/src/main/java/io/quarkus/ts/micrometer/prometheus/UsingRegistryPingPongResource.java b/monitoring/micrometer-prometheus/src/main/java/io/quarkus/ts/micrometer/prometheus/UsingRegistryPingPongResource.java index f86642c18b..e5022c1fac 100644 --- a/monitoring/micrometer-prometheus/src/main/java/io/quarkus/ts/micrometer/prometheus/UsingRegistryPingPongResource.java +++ b/monitoring/micrometer-prometheus/src/main/java/io/quarkus/ts/micrometer/prometheus/UsingRegistryPingPongResource.java @@ -2,12 +2,12 @@ import java.util.stream.IntStream; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; import io.micrometer.core.instrument.MeterRegistry; diff --git a/monitoring/micrometer-prometheus/src/main/java/io/quarkus/ts/micrometer/prometheus/WithoutCustomMetricsPingPongResource.java b/monitoring/micrometer-prometheus/src/main/java/io/quarkus/ts/micrometer/prometheus/WithoutCustomMetricsPingPongResource.java index 702364cfb4..6c25c860b5 100644 --- a/monitoring/micrometer-prometheus/src/main/java/io/quarkus/ts/micrometer/prometheus/WithoutCustomMetricsPingPongResource.java +++ b/monitoring/micrometer-prometheus/src/main/java/io/quarkus/ts/micrometer/prometheus/WithoutCustomMetricsPingPongResource.java @@ -1,9 +1,9 @@ package io.quarkus.ts.micrometer.prometheus; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; @Path("/without-metrics-pingpong") public class WithoutCustomMetricsPingPongResource { diff --git a/monitoring/micrometer-prometheus/src/test/java/io/quarkus/ts/micrometer/prometheus/OpenShiftCustomMetricsIT.java b/monitoring/micrometer-prometheus/src/test/java/io/quarkus/ts/micrometer/prometheus/OpenShiftCustomMetricsIT.java index 03d215aa44..1029360672 100644 --- a/monitoring/micrometer-prometheus/src/test/java/io/quarkus/ts/micrometer/prometheus/OpenShiftCustomMetricsIT.java +++ b/monitoring/micrometer-prometheus/src/test/java/io/quarkus/ts/micrometer/prometheus/OpenShiftCustomMetricsIT.java @@ -7,7 +7,7 @@ import java.nio.file.Paths; import java.util.concurrent.TimeUnit; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.http.HttpStatus; import org.jboss.logging.Logger; diff --git a/monitoring/microprofile-opentracing/src/main/java/io/quarkus/ts/microprofile/opentracing/ClientResource.java b/monitoring/microprofile-opentracing/src/main/java/io/quarkus/ts/microprofile/opentracing/ClientResource.java index edf06d32ba..b8f7011314 100644 --- a/monitoring/microprofile-opentracing/src/main/java/io/quarkus/ts/microprofile/opentracing/ClientResource.java +++ b/monitoring/microprofile-opentracing/src/main/java/io/quarkus/ts/microprofile/opentracing/ClientResource.java @@ -2,11 +2,11 @@ import java.util.concurrent.CompletionStage; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.eclipse.microprofile.faulttolerance.Asynchronous; import org.eclipse.microprofile.faulttolerance.Retry; diff --git a/monitoring/microprofile-opentracing/src/main/java/io/quarkus/ts/microprofile/opentracing/HelloClient.java b/monitoring/microprofile-opentracing/src/main/java/io/quarkus/ts/microprofile/opentracing/HelloClient.java index 4d01a0c747..6788b4a85b 100644 --- a/monitoring/microprofile-opentracing/src/main/java/io/quarkus/ts/microprofile/opentracing/HelloClient.java +++ b/monitoring/microprofile-opentracing/src/main/java/io/quarkus/ts/microprofile/opentracing/HelloClient.java @@ -4,10 +4,10 @@ import java.util.concurrent.CompletionStage; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.eclipse.microprofile.faulttolerance.Asynchronous; import org.eclipse.microprofile.faulttolerance.Fallback; diff --git a/monitoring/microprofile-opentracing/src/main/java/io/quarkus/ts/microprofile/opentracing/HelloResource.java b/monitoring/microprofile-opentracing/src/main/java/io/quarkus/ts/microprofile/opentracing/HelloResource.java index bf02201771..c34725dda9 100644 --- a/monitoring/microprofile-opentracing/src/main/java/io/quarkus/ts/microprofile/opentracing/HelloResource.java +++ b/monitoring/microprofile-opentracing/src/main/java/io/quarkus/ts/microprofile/opentracing/HelloResource.java @@ -2,13 +2,13 @@ import java.util.concurrent.CompletionStage; -import javax.inject.Inject; -import javax.ws.rs.DefaultValue; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +import jakarta.ws.rs.DefaultValue; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; import org.eclipse.microprofile.faulttolerance.Asynchronous; import org.eclipse.microprofile.faulttolerance.Retry; diff --git a/monitoring/microprofile-opentracing/src/main/java/io/quarkus/ts/microprofile/opentracing/HelloService.java b/monitoring/microprofile-opentracing/src/main/java/io/quarkus/ts/microprofile/opentracing/HelloService.java index 5e5d7e9255..8b35b7f75f 100644 --- a/monitoring/microprofile-opentracing/src/main/java/io/quarkus/ts/microprofile/opentracing/HelloService.java +++ b/monitoring/microprofile-opentracing/src/main/java/io/quarkus/ts/microprofile/opentracing/HelloService.java @@ -2,8 +2,8 @@ import java.util.concurrent.CompletionStage; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.eclipse.microprofile.context.ManagedExecutor; diff --git a/monitoring/opentelemetry-reactive/src/main/java/io/quarkus/ts/opentelemetry/reactive/PingPongService.java b/monitoring/opentelemetry-reactive/src/main/java/io/quarkus/ts/opentelemetry/reactive/PingPongService.java index b620462efe..fdfcafe0d6 100644 --- a/monitoring/opentelemetry-reactive/src/main/java/io/quarkus/ts/opentelemetry/reactive/PingPongService.java +++ b/monitoring/opentelemetry-reactive/src/main/java/io/quarkus/ts/opentelemetry/reactive/PingPongService.java @@ -1,9 +1,9 @@ package io.quarkus.ts.opentelemetry.reactive; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; diff --git a/monitoring/opentelemetry-reactive/src/main/java/io/quarkus/ts/opentelemetry/reactive/PingResource.java b/monitoring/opentelemetry-reactive/src/main/java/io/quarkus/ts/opentelemetry/reactive/PingResource.java index 3e761dfbb7..773ab06a58 100644 --- a/monitoring/opentelemetry-reactive/src/main/java/io/quarkus/ts/opentelemetry/reactive/PingResource.java +++ b/monitoring/opentelemetry-reactive/src/main/java/io/quarkus/ts/opentelemetry/reactive/PingResource.java @@ -1,10 +1,10 @@ package io.quarkus.ts.opentelemetry.reactive; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.eclipse.microprofile.rest.client.inject.RestClient; diff --git a/monitoring/opentelemetry-reactive/src/main/java/io/quarkus/ts/opentelemetry/reactive/PongResource.java b/monitoring/opentelemetry-reactive/src/main/java/io/quarkus/ts/opentelemetry/reactive/PongResource.java index c9de166766..a6ec158be7 100644 --- a/monitoring/opentelemetry-reactive/src/main/java/io/quarkus/ts/opentelemetry/reactive/PongResource.java +++ b/monitoring/opentelemetry-reactive/src/main/java/io/quarkus/ts/opentelemetry/reactive/PongResource.java @@ -1,9 +1,9 @@ package io.quarkus.ts.opentelemetry.reactive; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import io.smallrye.mutiny.Uni; diff --git a/monitoring/opentelemetry-reactive/src/main/java/io/quarkus/ts/opentelemetry/reactive/grpc/GrpcPingResource.java b/monitoring/opentelemetry-reactive/src/main/java/io/quarkus/ts/opentelemetry/reactive/grpc/GrpcPingResource.java index d936dcaf95..e5248ad32d 100644 --- a/monitoring/opentelemetry-reactive/src/main/java/io/quarkus/ts/opentelemetry/reactive/grpc/GrpcPingResource.java +++ b/monitoring/opentelemetry-reactive/src/main/java/io/quarkus/ts/opentelemetry/reactive/grpc/GrpcPingResource.java @@ -1,10 +1,10 @@ package io.quarkus.ts.opentelemetry.reactive.grpc; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import io.quarkus.example.PongRequest; import io.quarkus.example.PongServiceGrpc; diff --git a/monitoring/opentelemetry-reactive/src/main/java/io/quarkus/ts/opentelemetry/reactive/grpc/GrpcPongResource.java b/monitoring/opentelemetry-reactive/src/main/java/io/quarkus/ts/opentelemetry/reactive/grpc/GrpcPongResource.java index bdce6714e5..cc81622214 100644 --- a/monitoring/opentelemetry-reactive/src/main/java/io/quarkus/ts/opentelemetry/reactive/grpc/GrpcPongResource.java +++ b/monitoring/opentelemetry-reactive/src/main/java/io/quarkus/ts/opentelemetry/reactive/grpc/GrpcPongResource.java @@ -1,10 +1,10 @@ package io.quarkus.ts.opentelemetry.reactive.grpc; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.jboss.logging.Logger; diff --git a/monitoring/opentelemetry-reactive/src/main/java/io/quarkus/ts/opentelemetry/reactive/sse/ServerSentEventsPingResource.java b/monitoring/opentelemetry-reactive/src/main/java/io/quarkus/ts/opentelemetry/reactive/sse/ServerSentEventsPingResource.java index 5f3a13ef7f..b9ad86073b 100644 --- a/monitoring/opentelemetry-reactive/src/main/java/io/quarkus/ts/opentelemetry/reactive/sse/ServerSentEventsPingResource.java +++ b/monitoring/opentelemetry-reactive/src/main/java/io/quarkus/ts/opentelemetry/reactive/sse/ServerSentEventsPingResource.java @@ -3,15 +3,15 @@ import java.util.ArrayList; import java.util.List; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.sse.OutboundSseEvent; -import javax.ws.rs.sse.Sse; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.sse.OutboundSseEvent; +import jakarta.ws.rs.sse.Sse; import org.eclipse.microprofile.rest.client.inject.RestClient; diff --git a/monitoring/opentelemetry-reactive/src/main/java/io/quarkus/ts/opentelemetry/reactive/sse/ServerSentEventsPongClient.java b/monitoring/opentelemetry-reactive/src/main/java/io/quarkus/ts/opentelemetry/reactive/sse/ServerSentEventsPongClient.java index 3ae0179449..2652cbc01a 100644 --- a/monitoring/opentelemetry-reactive/src/main/java/io/quarkus/ts/opentelemetry/reactive/sse/ServerSentEventsPongClient.java +++ b/monitoring/opentelemetry-reactive/src/main/java/io/quarkus/ts/opentelemetry/reactive/sse/ServerSentEventsPongClient.java @@ -1,9 +1,9 @@ package io.quarkus.ts.opentelemetry.reactive.sse; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; diff --git a/monitoring/opentelemetry-reactive/src/main/java/io/quarkus/ts/opentelemetry/reactive/sse/ServerSentEventsPongResource.java b/monitoring/opentelemetry-reactive/src/main/java/io/quarkus/ts/opentelemetry/reactive/sse/ServerSentEventsPongResource.java index 84a52c2085..798434c505 100644 --- a/monitoring/opentelemetry-reactive/src/main/java/io/quarkus/ts/opentelemetry/reactive/sse/ServerSentEventsPongResource.java +++ b/monitoring/opentelemetry-reactive/src/main/java/io/quarkus/ts/opentelemetry/reactive/sse/ServerSentEventsPongResource.java @@ -1,9 +1,9 @@ package io.quarkus.ts.opentelemetry.reactive.sse; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import io.quarkus.ts.opentelemetry.reactive.traceable.TraceableResource; import io.smallrye.mutiny.Multi; diff --git a/monitoring/opentelemetry-reactive/src/main/java/io/quarkus/ts/opentelemetry/reactive/traceable/TraceableResource.java b/monitoring/opentelemetry-reactive/src/main/java/io/quarkus/ts/opentelemetry/reactive/traceable/TraceableResource.java index 7cb825458e..fcfce7e07e 100644 --- a/monitoring/opentelemetry-reactive/src/main/java/io/quarkus/ts/opentelemetry/reactive/traceable/TraceableResource.java +++ b/monitoring/opentelemetry-reactive/src/main/java/io/quarkus/ts/opentelemetry/reactive/traceable/TraceableResource.java @@ -1,9 +1,9 @@ package io.quarkus.ts.opentelemetry.reactive.traceable; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.jboss.logging.Logger; import org.jboss.logmanager.MDC; diff --git a/monitoring/opentelemetry-reactive/src/main/resources/application.properties b/monitoring/opentelemetry-reactive/src/main/resources/application.properties index 31d273872e..64e8ba5526 100644 --- a/monitoring/opentelemetry-reactive/src/main/resources/application.properties +++ b/monitoring/opentelemetry-reactive/src/main/resources/application.properties @@ -1,8 +1,8 @@ io.quarkus.ts.opentelemetry.reactive.PingPongService/mp-rest/url=${pongservice_url}:${pongservice_port} -io.quarkus.ts.opentelemetry.reactive.PingPongService/mp-rest/scope=javax.inject.Singleton +io.quarkus.ts.opentelemetry.reactive.PingPongService/mp-rest/scope=jakarta.inject.Singleton io.quarkus.ts.opentelemetry.reactive.sse.ServerSentEventsPongClient/mp-rest/url=http://localhost:${quarkus.http.port} -io.quarkus.ts.opentelemetry.reactive.sse.ServerSentEventsPongClient/mp-rest/scope=javax.inject.Singleton +io.quarkus.ts.opentelemetry.reactive.sse.ServerSentEventsPongClient/mp-rest/scope=jakarta.inject.Singleton # gRPC quarkus.grpc.clients.pong.host=localhost diff --git a/monitoring/opentelemetry-reactive/src/test/java/io/quarkus/ts/opentelemetry/reactive/OpenTelemetrySseIT.java b/monitoring/opentelemetry-reactive/src/test/java/io/quarkus/ts/opentelemetry/reactive/OpenTelemetrySseIT.java index 33cb230e5a..4ab064544b 100644 --- a/monitoring/opentelemetry-reactive/src/test/java/io/quarkus/ts/opentelemetry/reactive/OpenTelemetrySseIT.java +++ b/monitoring/opentelemetry-reactive/src/test/java/io/quarkus/ts/opentelemetry/reactive/OpenTelemetrySseIT.java @@ -8,7 +8,7 @@ import java.util.concurrent.TimeUnit; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import org.apache.http.HttpStatus; import org.junit.jupiter.api.Tag; diff --git a/monitoring/opentelemetry/src/main/java/io/quarkus/ts/opentelemetry/PingPongService.java b/monitoring/opentelemetry/src/main/java/io/quarkus/ts/opentelemetry/PingPongService.java index ac95543112..d4526cdcfa 100644 --- a/monitoring/opentelemetry/src/main/java/io/quarkus/ts/opentelemetry/PingPongService.java +++ b/monitoring/opentelemetry/src/main/java/io/quarkus/ts/opentelemetry/PingPongService.java @@ -1,9 +1,9 @@ package io.quarkus.ts.opentelemetry; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; diff --git a/monitoring/opentelemetry/src/main/java/io/quarkus/ts/opentelemetry/PingResource.java b/monitoring/opentelemetry/src/main/java/io/quarkus/ts/opentelemetry/PingResource.java index 3a134246aa..a60450071c 100644 --- a/monitoring/opentelemetry/src/main/java/io/quarkus/ts/opentelemetry/PingResource.java +++ b/monitoring/opentelemetry/src/main/java/io/quarkus/ts/opentelemetry/PingResource.java @@ -1,10 +1,10 @@ package io.quarkus.ts.opentelemetry; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.eclipse.microprofile.rest.client.inject.RestClient; diff --git a/monitoring/opentelemetry/src/main/java/io/quarkus/ts/opentelemetry/PongResource.java b/monitoring/opentelemetry/src/main/java/io/quarkus/ts/opentelemetry/PongResource.java index 731491cc0f..51604959c7 100644 --- a/monitoring/opentelemetry/src/main/java/io/quarkus/ts/opentelemetry/PongResource.java +++ b/monitoring/opentelemetry/src/main/java/io/quarkus/ts/opentelemetry/PongResource.java @@ -1,9 +1,9 @@ package io.quarkus.ts.opentelemetry; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; @Path("/hello") public class PongResource { diff --git a/monitoring/opentelemetry/src/main/java/io/quarkus/ts/opentelemetry/grpc/GrpcPingResource.java b/monitoring/opentelemetry/src/main/java/io/quarkus/ts/opentelemetry/grpc/GrpcPingResource.java index 14507e813a..7ebef56399 100644 --- a/monitoring/opentelemetry/src/main/java/io/quarkus/ts/opentelemetry/grpc/GrpcPingResource.java +++ b/monitoring/opentelemetry/src/main/java/io/quarkus/ts/opentelemetry/grpc/GrpcPingResource.java @@ -1,10 +1,10 @@ package io.quarkus.ts.opentelemetry.grpc; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import io.quarkus.example.PongRequest; import io.quarkus.example.PongServiceGrpc; diff --git a/monitoring/opentelemetry/src/main/java/io/quarkus/ts/opentelemetry/grpc/GrpcPongResource.java b/monitoring/opentelemetry/src/main/java/io/quarkus/ts/opentelemetry/grpc/GrpcPongResource.java index d35879fe84..5db7ae9e48 100644 --- a/monitoring/opentelemetry/src/main/java/io/quarkus/ts/opentelemetry/grpc/GrpcPongResource.java +++ b/monitoring/opentelemetry/src/main/java/io/quarkus/ts/opentelemetry/grpc/GrpcPongResource.java @@ -1,10 +1,10 @@ package io.quarkus.ts.opentelemetry.grpc; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.jboss.logging.Logger; diff --git a/monitoring/opentelemetry/src/main/java/io/quarkus/ts/opentelemetry/sse/ServerSentEventsPingResource.java b/monitoring/opentelemetry/src/main/java/io/quarkus/ts/opentelemetry/sse/ServerSentEventsPingResource.java index f698d0266d..161b394bc0 100644 --- a/monitoring/opentelemetry/src/main/java/io/quarkus/ts/opentelemetry/sse/ServerSentEventsPingResource.java +++ b/monitoring/opentelemetry/src/main/java/io/quarkus/ts/opentelemetry/sse/ServerSentEventsPingResource.java @@ -1,10 +1,10 @@ package io.quarkus.ts.opentelemetry.sse; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.eclipse.microprofile.rest.client.inject.RestClient; diff --git a/monitoring/opentelemetry/src/main/java/io/quarkus/ts/opentelemetry/sse/ServerSentEventsPongClient.java b/monitoring/opentelemetry/src/main/java/io/quarkus/ts/opentelemetry/sse/ServerSentEventsPongClient.java index 9da4cad17c..f98a8928d2 100644 --- a/monitoring/opentelemetry/src/main/java/io/quarkus/ts/opentelemetry/sse/ServerSentEventsPongClient.java +++ b/monitoring/opentelemetry/src/main/java/io/quarkus/ts/opentelemetry/sse/ServerSentEventsPongClient.java @@ -1,9 +1,9 @@ package io.quarkus.ts.opentelemetry.sse; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; diff --git a/monitoring/opentelemetry/src/main/java/io/quarkus/ts/opentelemetry/sse/ServerSentEventsPongResource.java b/monitoring/opentelemetry/src/main/java/io/quarkus/ts/opentelemetry/sse/ServerSentEventsPongResource.java index 41b8e64858..8f270f9f41 100644 --- a/monitoring/opentelemetry/src/main/java/io/quarkus/ts/opentelemetry/sse/ServerSentEventsPongResource.java +++ b/monitoring/opentelemetry/src/main/java/io/quarkus/ts/opentelemetry/sse/ServerSentEventsPongResource.java @@ -1,9 +1,9 @@ package io.quarkus.ts.opentelemetry.sse; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import io.quarkus.ts.opentelemetry.traceable.TraceableResource; import io.smallrye.mutiny.Multi; diff --git a/monitoring/opentelemetry/src/main/java/io/quarkus/ts/opentelemetry/traceable/TraceableResource.java b/monitoring/opentelemetry/src/main/java/io/quarkus/ts/opentelemetry/traceable/TraceableResource.java index cd852b8aa9..6970568b70 100644 --- a/monitoring/opentelemetry/src/main/java/io/quarkus/ts/opentelemetry/traceable/TraceableResource.java +++ b/monitoring/opentelemetry/src/main/java/io/quarkus/ts/opentelemetry/traceable/TraceableResource.java @@ -1,9 +1,9 @@ package io.quarkus.ts.opentelemetry.traceable; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.jboss.logging.Logger; import org.jboss.logmanager.MDC; diff --git a/monitoring/opentelemetry/src/main/resources/application.properties b/monitoring/opentelemetry/src/main/resources/application.properties index 9fc09e8cea..f45e420e19 100644 --- a/monitoring/opentelemetry/src/main/resources/application.properties +++ b/monitoring/opentelemetry/src/main/resources/application.properties @@ -1,8 +1,8 @@ io.quarkus.ts.opentelemetry.PingPongService/mp-rest/url=${pongservice_url}:${pongservice_port} -io.quarkus.ts.opentelemetry.PingPongService/mp-rest/scope=javax.inject.Singleton +io.quarkus.ts.opentelemetry.PingPongService/mp-rest/scope=jakarta.inject.Singleton io.quarkus.ts.opentelemetry.sse.ServerSentEventsPongClient/mp-rest/url=http://localhost:${quarkus.http.port} -io.quarkus.ts.opentelemetry.sse.ServerSentEventsPongClient/mp-rest/scope=javax.inject.Singleton +io.quarkus.ts.opentelemetry.sse.ServerSentEventsPongClient/mp-rest/scope=jakarta.inject.Singleton # gRPC quarkus.grpc.clients.pong.host=localhost diff --git a/monitoring/opentelemetry/src/test/java/io/quarkus/ts/opentelemetry/OpenTelemetrySseIT.java b/monitoring/opentelemetry/src/test/java/io/quarkus/ts/opentelemetry/OpenTelemetrySseIT.java index 2b0b63b35b..3e1582a7e4 100644 --- a/monitoring/opentelemetry/src/test/java/io/quarkus/ts/opentelemetry/OpenTelemetrySseIT.java +++ b/monitoring/opentelemetry/src/test/java/io/quarkus/ts/opentelemetry/OpenTelemetrySseIT.java @@ -8,7 +8,7 @@ import java.util.concurrent.TimeUnit; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import org.apache.http.HttpStatus; import org.junit.jupiter.api.Disabled; diff --git a/monitoring/opentracing-reactive-grpc/src/main/java/io/quarkus/ts/monitoring/opentracing/reactive/grpc/ping/GrpcPingResource.java b/monitoring/opentracing-reactive-grpc/src/main/java/io/quarkus/ts/monitoring/opentracing/reactive/grpc/ping/GrpcPingResource.java index 9d298f307f..b99a345c21 100644 --- a/monitoring/opentracing-reactive-grpc/src/main/java/io/quarkus/ts/monitoring/opentracing/reactive/grpc/ping/GrpcPingResource.java +++ b/monitoring/opentracing-reactive-grpc/src/main/java/io/quarkus/ts/monitoring/opentracing/reactive/grpc/ping/GrpcPingResource.java @@ -1,10 +1,10 @@ package io.quarkus.ts.monitoring.opentracing.reactive.grpc.ping; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import io.quarkus.example.PongRequest; import io.quarkus.example.PongServiceGrpc; diff --git a/monitoring/opentracing-reactive-grpc/src/main/java/io/quarkus/ts/monitoring/opentracing/reactive/grpc/ping/PingResource.java b/monitoring/opentracing-reactive-grpc/src/main/java/io/quarkus/ts/monitoring/opentracing/reactive/grpc/ping/PingResource.java index d19a633697..6c97090a29 100644 --- a/monitoring/opentracing-reactive-grpc/src/main/java/io/quarkus/ts/monitoring/opentracing/reactive/grpc/ping/PingResource.java +++ b/monitoring/opentracing-reactive-grpc/src/main/java/io/quarkus/ts/monitoring/opentracing/reactive/grpc/ping/PingResource.java @@ -1,10 +1,10 @@ package io.quarkus.ts.monitoring.opentracing.reactive.grpc.ping; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.eclipse.microprofile.rest.client.inject.RestClient; diff --git a/monitoring/opentracing-reactive-grpc/src/main/java/io/quarkus/ts/monitoring/opentracing/reactive/grpc/ping/ReactivePingResource.java b/monitoring/opentracing-reactive-grpc/src/main/java/io/quarkus/ts/monitoring/opentracing/reactive/grpc/ping/ReactivePingResource.java index 38fa3cf596..4594de97aa 100644 --- a/monitoring/opentracing-reactive-grpc/src/main/java/io/quarkus/ts/monitoring/opentracing/reactive/grpc/ping/ReactivePingResource.java +++ b/monitoring/opentracing-reactive-grpc/src/main/java/io/quarkus/ts/monitoring/opentracing/reactive/grpc/ping/ReactivePingResource.java @@ -1,10 +1,10 @@ package io.quarkus.ts.monitoring.opentracing.reactive.grpc.ping; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.eclipse.microprofile.rest.client.inject.RestClient; diff --git a/monitoring/opentracing-reactive-grpc/src/main/java/io/quarkus/ts/monitoring/opentracing/reactive/grpc/ping/ServerSentEventsPingResource.java b/monitoring/opentracing-reactive-grpc/src/main/java/io/quarkus/ts/monitoring/opentracing/reactive/grpc/ping/ServerSentEventsPingResource.java index ba830e0c4c..70da6247fe 100644 --- a/monitoring/opentracing-reactive-grpc/src/main/java/io/quarkus/ts/monitoring/opentracing/reactive/grpc/ping/ServerSentEventsPingResource.java +++ b/monitoring/opentracing-reactive-grpc/src/main/java/io/quarkus/ts/monitoring/opentracing/reactive/grpc/ping/ServerSentEventsPingResource.java @@ -1,10 +1,10 @@ package io.quarkus.ts.monitoring.opentracing.reactive.grpc.ping; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.eclipse.microprofile.rest.client.inject.RestClient; diff --git a/monitoring/opentracing-reactive-grpc/src/main/java/io/quarkus/ts/monitoring/opentracing/reactive/grpc/ping/clients/PongClient.java b/monitoring/opentracing-reactive-grpc/src/main/java/io/quarkus/ts/monitoring/opentracing/reactive/grpc/ping/clients/PongClient.java index 304501d813..40e057d7d6 100644 --- a/monitoring/opentracing-reactive-grpc/src/main/java/io/quarkus/ts/monitoring/opentracing/reactive/grpc/ping/clients/PongClient.java +++ b/monitoring/opentracing-reactive-grpc/src/main/java/io/quarkus/ts/monitoring/opentracing/reactive/grpc/ping/clients/PongClient.java @@ -1,9 +1,9 @@ package io.quarkus.ts.monitoring.opentracing.reactive.grpc.ping.clients; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; diff --git a/monitoring/opentracing-reactive-grpc/src/main/java/io/quarkus/ts/monitoring/opentracing/reactive/grpc/ping/clients/ReactivePongClient.java b/monitoring/opentracing-reactive-grpc/src/main/java/io/quarkus/ts/monitoring/opentracing/reactive/grpc/ping/clients/ReactivePongClient.java index 40b0d32c0e..a485f46b43 100644 --- a/monitoring/opentracing-reactive-grpc/src/main/java/io/quarkus/ts/monitoring/opentracing/reactive/grpc/ping/clients/ReactivePongClient.java +++ b/monitoring/opentracing-reactive-grpc/src/main/java/io/quarkus/ts/monitoring/opentracing/reactive/grpc/ping/clients/ReactivePongClient.java @@ -1,9 +1,9 @@ package io.quarkus.ts.monitoring.opentracing.reactive.grpc.ping.clients; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; diff --git a/monitoring/opentracing-reactive-grpc/src/main/java/io/quarkus/ts/monitoring/opentracing/reactive/grpc/ping/clients/ServerSentEventsPongClient.java b/monitoring/opentracing-reactive-grpc/src/main/java/io/quarkus/ts/monitoring/opentracing/reactive/grpc/ping/clients/ServerSentEventsPongClient.java index 5347bbed72..e7a3211cc0 100644 --- a/monitoring/opentracing-reactive-grpc/src/main/java/io/quarkus/ts/monitoring/opentracing/reactive/grpc/ping/clients/ServerSentEventsPongClient.java +++ b/monitoring/opentracing-reactive-grpc/src/main/java/io/quarkus/ts/monitoring/opentracing/reactive/grpc/ping/clients/ServerSentEventsPongClient.java @@ -1,9 +1,9 @@ package io.quarkus.ts.monitoring.opentracing.reactive.grpc.ping.clients; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; diff --git a/monitoring/opentracing-reactive-grpc/src/main/java/io/quarkus/ts/monitoring/opentracing/reactive/grpc/pong/GrpcPongResource.java b/monitoring/opentracing-reactive-grpc/src/main/java/io/quarkus/ts/monitoring/opentracing/reactive/grpc/pong/GrpcPongResource.java index 9a8a98871e..fdd0963f99 100644 --- a/monitoring/opentracing-reactive-grpc/src/main/java/io/quarkus/ts/monitoring/opentracing/reactive/grpc/pong/GrpcPongResource.java +++ b/monitoring/opentracing-reactive-grpc/src/main/java/io/quarkus/ts/monitoring/opentracing/reactive/grpc/pong/GrpcPongResource.java @@ -1,10 +1,10 @@ package io.quarkus.ts.monitoring.opentracing.reactive.grpc.pong; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.jboss.logging.Logger; diff --git a/monitoring/opentracing-reactive-grpc/src/main/java/io/quarkus/ts/monitoring/opentracing/reactive/grpc/pong/PongResource.java b/monitoring/opentracing-reactive-grpc/src/main/java/io/quarkus/ts/monitoring/opentracing/reactive/grpc/pong/PongResource.java index daab170b2e..f78cb4cbaf 100644 --- a/monitoring/opentracing-reactive-grpc/src/main/java/io/quarkus/ts/monitoring/opentracing/reactive/grpc/pong/PongResource.java +++ b/monitoring/opentracing-reactive-grpc/src/main/java/io/quarkus/ts/monitoring/opentracing/reactive/grpc/pong/PongResource.java @@ -1,9 +1,9 @@ package io.quarkus.ts.monitoring.opentracing.reactive.grpc.pong; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import io.quarkus.ts.monitoring.opentracing.reactive.grpc.traceable.TraceableResource; diff --git a/monitoring/opentracing-reactive-grpc/src/main/java/io/quarkus/ts/monitoring/opentracing/reactive/grpc/pong/ReactivePongResource.java b/monitoring/opentracing-reactive-grpc/src/main/java/io/quarkus/ts/monitoring/opentracing/reactive/grpc/pong/ReactivePongResource.java index cb65abec80..787ffa8bb8 100644 --- a/monitoring/opentracing-reactive-grpc/src/main/java/io/quarkus/ts/monitoring/opentracing/reactive/grpc/pong/ReactivePongResource.java +++ b/monitoring/opentracing-reactive-grpc/src/main/java/io/quarkus/ts/monitoring/opentracing/reactive/grpc/pong/ReactivePongResource.java @@ -1,9 +1,9 @@ package io.quarkus.ts.monitoring.opentracing.reactive.grpc.pong; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import io.quarkus.ts.monitoring.opentracing.reactive.grpc.traceable.TraceableResource; import io.smallrye.mutiny.Uni; diff --git a/monitoring/opentracing-reactive-grpc/src/main/java/io/quarkus/ts/monitoring/opentracing/reactive/grpc/pong/ServerSentEventsPongResource.java b/monitoring/opentracing-reactive-grpc/src/main/java/io/quarkus/ts/monitoring/opentracing/reactive/grpc/pong/ServerSentEventsPongResource.java index 1289af8817..ad0d648cb1 100644 --- a/monitoring/opentracing-reactive-grpc/src/main/java/io/quarkus/ts/monitoring/opentracing/reactive/grpc/pong/ServerSentEventsPongResource.java +++ b/monitoring/opentracing-reactive-grpc/src/main/java/io/quarkus/ts/monitoring/opentracing/reactive/grpc/pong/ServerSentEventsPongResource.java @@ -1,9 +1,9 @@ package io.quarkus.ts.monitoring.opentracing.reactive.grpc.pong; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import io.quarkus.ts.monitoring.opentracing.reactive.grpc.traceable.TraceableResource; import io.smallrye.mutiny.Multi; diff --git a/monitoring/opentracing-reactive-grpc/src/main/java/io/quarkus/ts/monitoring/opentracing/reactive/grpc/traceable/TraceableResource.java b/monitoring/opentracing-reactive-grpc/src/main/java/io/quarkus/ts/monitoring/opentracing/reactive/grpc/traceable/TraceableResource.java index e9e7d80dfb..4b3e6c08ae 100644 --- a/monitoring/opentracing-reactive-grpc/src/main/java/io/quarkus/ts/monitoring/opentracing/reactive/grpc/traceable/TraceableResource.java +++ b/monitoring/opentracing-reactive-grpc/src/main/java/io/quarkus/ts/monitoring/opentracing/reactive/grpc/traceable/TraceableResource.java @@ -1,9 +1,9 @@ package io.quarkus.ts.monitoring.opentracing.reactive.grpc.traceable; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.jboss.logging.Logger; import org.jboss.logmanager.MDC; diff --git a/monitoring/opentracing-reactive-grpc/src/main/resources/application.properties b/monitoring/opentracing-reactive-grpc/src/main/resources/application.properties index 04f4a96f94..3d5ddb6cad 100644 --- a/monitoring/opentracing-reactive-grpc/src/main/resources/application.properties +++ b/monitoring/opentracing-reactive-grpc/src/main/resources/application.properties @@ -6,13 +6,13 @@ quarkus.log.console.format=%d{HH:mm:ss} %-5p traceId=%X{traceId}, parentId=%X{pa # RestClient io.quarkus.ts.monitoring.opentracing.reactive.grpc.ping.clients.PongClient/mp-rest/url=http://localhost:${quarkus.http.port} -io.quarkus.ts.monitoring.opentracing.reactive.grpc.ping.clients.PongClient/mp-rest/scope=javax.inject.Singleton +io.quarkus.ts.monitoring.opentracing.reactive.grpc.ping.clients.PongClient/mp-rest/scope=jakarta.inject.Singleton io.quarkus.ts.monitoring.opentracing.reactive.grpc.ping.clients.ReactivePongClient/mp-rest/url=http://localhost:${quarkus.http.port} -io.quarkus.ts.monitoring.opentracing.reactive.grpc.ping.clients.ReactivePongClient/mp-rest/scope=javax.inject.Singleton +io.quarkus.ts.monitoring.opentracing.reactive.grpc.ping.clients.ReactivePongClient/mp-rest/scope=jakarta.inject.Singleton io.quarkus.ts.monitoring.opentracing.reactive.grpc.ping.clients.ServerSentEventsPongClient/mp-rest/url=http://localhost:${quarkus.http.port} -io.quarkus.ts.monitoring.opentracing.reactive.grpc.ping.clients.ServerSentEventsPongClient/mp-rest/scope=javax.inject.Singleton +io.quarkus.ts.monitoring.opentracing.reactive.grpc.ping.clients.ServerSentEventsPongClient/mp-rest/scope=jakarta.inject.Singleton # gRPC quarkus.grpc.clients.pong.host=localhost \ No newline at end of file diff --git a/nosql-db/infinispan/src/main/java/io/quarkus/ts/infinispan/client/FirstCounterResource.java b/nosql-db/infinispan/src/main/java/io/quarkus/ts/infinispan/client/FirstCounterResource.java index 74319a9c54..8a58b895a1 100644 --- a/nosql-db/infinispan/src/main/java/io/quarkus/ts/infinispan/client/FirstCounterResource.java +++ b/nosql-db/infinispan/src/main/java/io/quarkus/ts/infinispan/client/FirstCounterResource.java @@ -1,6 +1,6 @@ package io.quarkus.ts.infinispan.client; -import javax.ws.rs.Path; +import jakarta.ws.rs.Path; @Path("/first-counter") public class FirstCounterResource extends InfinispanCounterResource { diff --git a/nosql-db/infinispan/src/main/java/io/quarkus/ts/infinispan/client/InfinispanClientApp.java b/nosql-db/infinispan/src/main/java/io/quarkus/ts/infinispan/client/InfinispanClientApp.java index 40d467356a..dec129f067 100644 --- a/nosql-db/infinispan/src/main/java/io/quarkus/ts/infinispan/client/InfinispanClientApp.java +++ b/nosql-db/infinispan/src/main/java/io/quarkus/ts/infinispan/client/InfinispanClientApp.java @@ -1,8 +1,8 @@ package io.quarkus.ts.infinispan.client; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.event.Observes; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.event.Observes; +import jakarta.inject.Inject; import org.infinispan.client.hotrod.RemoteCache; import org.infinispan.client.hotrod.RemoteCacheManager; diff --git a/nosql-db/infinispan/src/main/java/io/quarkus/ts/infinispan/client/InfinispanCounterResource.java b/nosql-db/infinispan/src/main/java/io/quarkus/ts/infinispan/client/InfinispanCounterResource.java index e3713c9092..e96df38bf6 100644 --- a/nosql-db/infinispan/src/main/java/io/quarkus/ts/infinispan/client/InfinispanCounterResource.java +++ b/nosql-db/infinispan/src/main/java/io/quarkus/ts/infinispan/client/InfinispanCounterResource.java @@ -2,12 +2,12 @@ import java.util.concurrent.atomic.AtomicInteger; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.infinispan.client.hotrod.RemoteCache; diff --git a/nosql-db/infinispan/src/main/java/io/quarkus/ts/infinispan/client/SecondCounterResource.java b/nosql-db/infinispan/src/main/java/io/quarkus/ts/infinispan/client/SecondCounterResource.java index 6294c22ecf..5c650a1c22 100644 --- a/nosql-db/infinispan/src/main/java/io/quarkus/ts/infinispan/client/SecondCounterResource.java +++ b/nosql-db/infinispan/src/main/java/io/quarkus/ts/infinispan/client/SecondCounterResource.java @@ -1,6 +1,6 @@ package io.quarkus.ts.infinispan.client; -import javax.ws.rs.Path; +import jakarta.ws.rs.Path; @Path("/second-counter") public class SecondCounterResource extends InfinispanCounterResource { diff --git a/nosql-db/mongodb-reactive/src/main/java/io/quarkus/ts/nosqldb/mongodb/reactive/AbstractReactiveMongoDao.java b/nosql-db/mongodb-reactive/src/main/java/io/quarkus/ts/nosqldb/mongodb/reactive/AbstractReactiveMongoDao.java index d213aed16d..dc054491b1 100644 --- a/nosql-db/mongodb-reactive/src/main/java/io/quarkus/ts/nosqldb/mongodb/reactive/AbstractReactiveMongoDao.java +++ b/nosql-db/mongodb-reactive/src/main/java/io/quarkus/ts/nosqldb/mongodb/reactive/AbstractReactiveMongoDao.java @@ -3,7 +3,7 @@ import java.util.List; import java.util.function.Function; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.bson.Document; import org.bson.conversions.Bson; diff --git a/nosql-db/mongodb-reactive/src/main/java/io/quarkus/ts/nosqldb/mongodb/reactive/ReactiveFruitBasketResource.java b/nosql-db/mongodb-reactive/src/main/java/io/quarkus/ts/nosqldb/mongodb/reactive/ReactiveFruitBasketResource.java index 057c4b1251..5696245783 100644 --- a/nosql-db/mongodb-reactive/src/main/java/io/quarkus/ts/nosqldb/mongodb/reactive/ReactiveFruitBasketResource.java +++ b/nosql-db/mongodb-reactive/src/main/java/io/quarkus/ts/nosqldb/mongodb/reactive/ReactiveFruitBasketResource.java @@ -2,13 +2,13 @@ import java.util.List; -import javax.inject.Inject; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import io.smallrye.mutiny.Uni; diff --git a/nosql-db/mongodb-reactive/src/main/java/io/quarkus/ts/nosqldb/mongodb/reactive/ReactiveFruitBasketService.java b/nosql-db/mongodb-reactive/src/main/java/io/quarkus/ts/nosqldb/mongodb/reactive/ReactiveFruitBasketService.java index 178093937a..6d8a30d72c 100644 --- a/nosql-db/mongodb-reactive/src/main/java/io/quarkus/ts/nosqldb/mongodb/reactive/ReactiveFruitBasketService.java +++ b/nosql-db/mongodb-reactive/src/main/java/io/quarkus/ts/nosqldb/mongodb/reactive/ReactiveFruitBasketService.java @@ -2,7 +2,7 @@ import java.util.List; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import com.mongodb.client.model.Filters; import com.mongodb.client.model.Projections; diff --git a/nosql-db/mongodb-reactive/src/main/java/io/quarkus/ts/nosqldb/mongodb/reactive/ReactiveFruitResource.java b/nosql-db/mongodb-reactive/src/main/java/io/quarkus/ts/nosqldb/mongodb/reactive/ReactiveFruitResource.java index 00370c16ee..64c41bd8ef 100644 --- a/nosql-db/mongodb-reactive/src/main/java/io/quarkus/ts/nosqldb/mongodb/reactive/ReactiveFruitResource.java +++ b/nosql-db/mongodb-reactive/src/main/java/io/quarkus/ts/nosqldb/mongodb/reactive/ReactiveFruitResource.java @@ -2,13 +2,13 @@ import java.util.List; -import javax.inject.Inject; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import io.smallrye.mutiny.Uni; diff --git a/nosql-db/mongodb-reactive/src/main/java/io/quarkus/ts/nosqldb/mongodb/reactive/ReactiveFruitService.java b/nosql-db/mongodb-reactive/src/main/java/io/quarkus/ts/nosqldb/mongodb/reactive/ReactiveFruitService.java index 9f54e73e3a..c93517346d 100644 --- a/nosql-db/mongodb-reactive/src/main/java/io/quarkus/ts/nosqldb/mongodb/reactive/ReactiveFruitService.java +++ b/nosql-db/mongodb-reactive/src/main/java/io/quarkus/ts/nosqldb/mongodb/reactive/ReactiveFruitService.java @@ -2,7 +2,7 @@ import java.util.List; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import com.mongodb.client.model.Filters; diff --git a/nosql-db/mongodb/src/main/java/io/quarkus/ts/nosqldb/mongodb/AbstractCodecMongoDao.java b/nosql-db/mongodb/src/main/java/io/quarkus/ts/nosqldb/mongodb/AbstractCodecMongoDao.java index 9e97980b99..1573eac235 100644 --- a/nosql-db/mongodb/src/main/java/io/quarkus/ts/nosqldb/mongodb/AbstractCodecMongoDao.java +++ b/nosql-db/mongodb/src/main/java/io/quarkus/ts/nosqldb/mongodb/AbstractCodecMongoDao.java @@ -3,7 +3,7 @@ import java.util.ArrayList; import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.bson.conversions.Bson; diff --git a/nosql-db/mongodb/src/main/java/io/quarkus/ts/nosqldb/mongodb/AbstractMongoDao.java b/nosql-db/mongodb/src/main/java/io/quarkus/ts/nosqldb/mongodb/AbstractMongoDao.java index c811e4a22c..ddfe7dc2f4 100644 --- a/nosql-db/mongodb/src/main/java/io/quarkus/ts/nosqldb/mongodb/AbstractMongoDao.java +++ b/nosql-db/mongodb/src/main/java/io/quarkus/ts/nosqldb/mongodb/AbstractMongoDao.java @@ -4,7 +4,7 @@ import java.util.List; import java.util.function.Function; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.bson.Document; import org.bson.conversions.Bson; diff --git a/nosql-db/mongodb/src/main/java/io/quarkus/ts/nosqldb/mongodb/CodecFruitBasketResource.java b/nosql-db/mongodb/src/main/java/io/quarkus/ts/nosqldb/mongodb/CodecFruitBasketResource.java index 768d816c53..62cbd8798c 100644 --- a/nosql-db/mongodb/src/main/java/io/quarkus/ts/nosqldb/mongodb/CodecFruitBasketResource.java +++ b/nosql-db/mongodb/src/main/java/io/quarkus/ts/nosqldb/mongodb/CodecFruitBasketResource.java @@ -2,13 +2,13 @@ import java.util.List; -import javax.inject.Inject; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; @Path("/codec_fruit_baskets") @Produces(MediaType.APPLICATION_JSON) diff --git a/nosql-db/mongodb/src/main/java/io/quarkus/ts/nosqldb/mongodb/CodecFruitBasketService.java b/nosql-db/mongodb/src/main/java/io/quarkus/ts/nosqldb/mongodb/CodecFruitBasketService.java index 344491d7df..1fb01c7743 100644 --- a/nosql-db/mongodb/src/main/java/io/quarkus/ts/nosqldb/mongodb/CodecFruitBasketService.java +++ b/nosql-db/mongodb/src/main/java/io/quarkus/ts/nosqldb/mongodb/CodecFruitBasketService.java @@ -2,7 +2,7 @@ import java.util.List; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import com.mongodb.client.model.Filters; import com.mongodb.client.model.Projections; diff --git a/nosql-db/mongodb/src/main/java/io/quarkus/ts/nosqldb/mongodb/CodecFruitResource.java b/nosql-db/mongodb/src/main/java/io/quarkus/ts/nosqldb/mongodb/CodecFruitResource.java index 8d9986b3fb..bb7632db41 100644 --- a/nosql-db/mongodb/src/main/java/io/quarkus/ts/nosqldb/mongodb/CodecFruitResource.java +++ b/nosql-db/mongodb/src/main/java/io/quarkus/ts/nosqldb/mongodb/CodecFruitResource.java @@ -2,13 +2,13 @@ import java.util.List; -import javax.inject.Inject; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; @Path("/codec_fruits") @Produces(MediaType.APPLICATION_JSON) diff --git a/nosql-db/mongodb/src/main/java/io/quarkus/ts/nosqldb/mongodb/CodecFruitService.java b/nosql-db/mongodb/src/main/java/io/quarkus/ts/nosqldb/mongodb/CodecFruitService.java index c805f0cbb1..fe99373646 100644 --- a/nosql-db/mongodb/src/main/java/io/quarkus/ts/nosqldb/mongodb/CodecFruitService.java +++ b/nosql-db/mongodb/src/main/java/io/quarkus/ts/nosqldb/mongodb/CodecFruitService.java @@ -2,7 +2,7 @@ import java.util.List; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import com.mongodb.client.model.Filters; diff --git a/nosql-db/mongodb/src/main/java/io/quarkus/ts/nosqldb/mongodb/FruitBasketResource.java b/nosql-db/mongodb/src/main/java/io/quarkus/ts/nosqldb/mongodb/FruitBasketResource.java index a55b03755d..1fec08a09f 100644 --- a/nosql-db/mongodb/src/main/java/io/quarkus/ts/nosqldb/mongodb/FruitBasketResource.java +++ b/nosql-db/mongodb/src/main/java/io/quarkus/ts/nosqldb/mongodb/FruitBasketResource.java @@ -2,13 +2,13 @@ import java.util.List; -import javax.inject.Inject; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; @Path("/fruit_baskets") @Produces(MediaType.APPLICATION_JSON) diff --git a/nosql-db/mongodb/src/main/java/io/quarkus/ts/nosqldb/mongodb/FruitBasketService.java b/nosql-db/mongodb/src/main/java/io/quarkus/ts/nosqldb/mongodb/FruitBasketService.java index 768302d652..388d1df0dd 100644 --- a/nosql-db/mongodb/src/main/java/io/quarkus/ts/nosqldb/mongodb/FruitBasketService.java +++ b/nosql-db/mongodb/src/main/java/io/quarkus/ts/nosqldb/mongodb/FruitBasketService.java @@ -2,7 +2,7 @@ import java.util.List; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import com.mongodb.client.model.Filters; import com.mongodb.client.model.Projections; diff --git a/nosql-db/mongodb/src/main/java/io/quarkus/ts/nosqldb/mongodb/FruitResource.java b/nosql-db/mongodb/src/main/java/io/quarkus/ts/nosqldb/mongodb/FruitResource.java index 331aa28f6f..9eded1cf61 100644 --- a/nosql-db/mongodb/src/main/java/io/quarkus/ts/nosqldb/mongodb/FruitResource.java +++ b/nosql-db/mongodb/src/main/java/io/quarkus/ts/nosqldb/mongodb/FruitResource.java @@ -2,13 +2,13 @@ import java.util.List; -import javax.inject.Inject; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; @Path("/fruits") @Produces(MediaType.APPLICATION_JSON) diff --git a/nosql-db/mongodb/src/main/java/io/quarkus/ts/nosqldb/mongodb/FruitService.java b/nosql-db/mongodb/src/main/java/io/quarkus/ts/nosqldb/mongodb/FruitService.java index 60af54ea6e..efaa78c27e 100644 --- a/nosql-db/mongodb/src/main/java/io/quarkus/ts/nosqldb/mongodb/FruitService.java +++ b/nosql-db/mongodb/src/main/java/io/quarkus/ts/nosqldb/mongodb/FruitService.java @@ -2,7 +2,7 @@ import java.util.List; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import com.mongodb.client.model.Filters; diff --git a/pom.xml b/pom.xml index 58890f88bb..fab8bd41bd 100644 --- a/pom.xml +++ b/pom.xml @@ -18,8 +18,8 @@ 2.22.2 quarkus-bom io.quarkus - 2.16.1.Final - 1.3.0.Beta3 + 999-SNAPSHOT + 1.3.0.Beta5 0.42.0 2.12.1.Final 4.5.14 @@ -286,7 +286,7 @@ .cache - java.,javax.,org.,com.,io. + java.,jakarta.,org.,com.,io. * true @@ -491,7 +491,8 @@ env-info messaging/amqp-reactive - messaging/qpid + + messaging/kafka-streams-reactive-messaging messaging/kafka-confluent-avro-reactive-messaging messaging/kafka-strimzi-avro-reactive-messaging @@ -507,7 +508,8 @@ env-info messaging/amqp-reactive - messaging/qpid + + diff --git a/properties/src/main/java/io/quarkus/ts/properties/GreetingResource.java b/properties/src/main/java/io/quarkus/ts/properties/GreetingResource.java index 8e8a780320..6d96e9ca5d 100644 --- a/properties/src/main/java/io/quarkus/ts/properties/GreetingResource.java +++ b/properties/src/main/java/io/quarkus/ts/properties/GreetingResource.java @@ -3,11 +3,11 @@ import java.util.List; import java.util.stream.Collectors; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.eclipse.microprofile.config.Config; import org.eclipse.microprofile.config.inject.ConfigProperty; diff --git a/properties/src/main/java/io/quarkus/ts/properties/bulk/BindMapsUsingConfigValueResource.java b/properties/src/main/java/io/quarkus/ts/properties/bulk/BindMapsUsingConfigValueResource.java index 7b945beffc..368c1ac5fd 100644 --- a/properties/src/main/java/io/quarkus/ts/properties/bulk/BindMapsUsingConfigValueResource.java +++ b/properties/src/main/java/io/quarkus/ts/properties/bulk/BindMapsUsingConfigValueResource.java @@ -2,9 +2,9 @@ import java.util.Map; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; import org.eclipse.microprofile.config.inject.ConfigProperty; diff --git a/properties/src/main/java/io/quarkus/ts/properties/bulk/BulkOfPropertiesResource.java b/properties/src/main/java/io/quarkus/ts/properties/bulk/BulkOfPropertiesResource.java index 33dce604db..0c3a1e87a4 100644 --- a/properties/src/main/java/io/quarkus/ts/properties/bulk/BulkOfPropertiesResource.java +++ b/properties/src/main/java/io/quarkus/ts/properties/bulk/BulkOfPropertiesResource.java @@ -1,7 +1,7 @@ package io.quarkus.ts.properties.bulk; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import org.eclipse.microprofile.config.inject.ConfigProperties; diff --git a/properties/src/main/java/io/quarkus/ts/properties/bulk/ConfigValueResource.java b/properties/src/main/java/io/quarkus/ts/properties/bulk/ConfigValueResource.java index 917f4e07e8..ad9b39a4e2 100644 --- a/properties/src/main/java/io/quarkus/ts/properties/bulk/ConfigValueResource.java +++ b/properties/src/main/java/io/quarkus/ts/properties/bulk/ConfigValueResource.java @@ -1,7 +1,7 @@ package io.quarkus.ts.properties.bulk; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import org.eclipse.microprofile.config.ConfigValue; import org.eclipse.microprofile.config.inject.ConfigProperty; diff --git a/properties/src/main/java/io/quarkus/ts/properties/config/ProtagonistConfiguration.java b/properties/src/main/java/io/quarkus/ts/properties/config/ProtagonistConfiguration.java index 0c918b6777..ecbb8b9a58 100644 --- a/properties/src/main/java/io/quarkus/ts/properties/config/ProtagonistConfiguration.java +++ b/properties/src/main/java/io/quarkus/ts/properties/config/ProtagonistConfiguration.java @@ -1,7 +1,7 @@ package io.quarkus.ts.properties.config; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import io.quarkus.ts.properties.config.interfaces.ProtagonistConfigurable; diff --git a/properties/src/main/java/io/quarkus/ts/properties/configmapping/ConfigMappingResource.java b/properties/src/main/java/io/quarkus/ts/properties/configmapping/ConfigMappingResource.java index 4ebd069339..d8ce28f80f 100644 --- a/properties/src/main/java/io/quarkus/ts/properties/configmapping/ConfigMappingResource.java +++ b/properties/src/main/java/io/quarkus/ts/properties/configmapping/ConfigMappingResource.java @@ -1,9 +1,9 @@ package io.quarkus.ts.properties.configmapping; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; import io.smallrye.config.ConfigMapping; diff --git a/quarkus-cli/src/test/java/io/quarkus/ts/quarkus/cli/QuarkusCliCompletionIT.java b/quarkus-cli/src/test/java/io/quarkus/ts/quarkus/cli/QuarkusCliCompletionIT.java index 9617483205..117aac159f 100644 --- a/quarkus-cli/src/test/java/io/quarkus/ts/quarkus/cli/QuarkusCliCompletionIT.java +++ b/quarkus-cli/src/test/java/io/quarkus/ts/quarkus/cli/QuarkusCliCompletionIT.java @@ -2,7 +2,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; diff --git a/quarkus-cli/src/test/java/io/quarkus/ts/quarkus/cli/QuarkusCliCreateExtensionIT.java b/quarkus-cli/src/test/java/io/quarkus/ts/quarkus/cli/QuarkusCliCreateExtensionIT.java index 791e67d365..5f43d54c6b 100644 --- a/quarkus-cli/src/test/java/io/quarkus/ts/quarkus/cli/QuarkusCliCreateExtensionIT.java +++ b/quarkus-cli/src/test/java/io/quarkus/ts/quarkus/cli/QuarkusCliCreateExtensionIT.java @@ -3,7 +3,7 @@ import static io.quarkus.ts.quarkus.cli.QuarkusCliUtils.defaultNewExtensionArgsWithFixedStream; import static org.junit.jupiter.api.Assertions.assertTrue; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.DisabledIfSystemProperty; diff --git a/quarkus-cli/src/test/java/io/quarkus/ts/quarkus/cli/QuarkusCliCreateJvmApplicationIT.java b/quarkus-cli/src/test/java/io/quarkus/ts/quarkus/cli/QuarkusCliCreateJvmApplicationIT.java index 38089722e5..4f592ffe0d 100644 --- a/quarkus-cli/src/test/java/io/quarkus/ts/quarkus/cli/QuarkusCliCreateJvmApplicationIT.java +++ b/quarkus-cli/src/test/java/io/quarkus/ts/quarkus/cli/QuarkusCliCreateJvmApplicationIT.java @@ -25,7 +25,7 @@ import java.util.Scanner; import java.util.stream.Stream; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.lang3.StringUtils; import org.apache.http.HttpStatus; diff --git a/quarkus-cli/src/test/java/io/quarkus/ts/quarkus/cli/QuarkusCliCreateNativeApplicationIT.java b/quarkus-cli/src/test/java/io/quarkus/ts/quarkus/cli/QuarkusCliCreateNativeApplicationIT.java index f4af7b6874..8315d5d0a5 100644 --- a/quarkus-cli/src/test/java/io/quarkus/ts/quarkus/cli/QuarkusCliCreateNativeApplicationIT.java +++ b/quarkus-cli/src/test/java/io/quarkus/ts/quarkus/cli/QuarkusCliCreateNativeApplicationIT.java @@ -3,7 +3,7 @@ import static io.quarkus.ts.quarkus.cli.QuarkusCliUtils.defaultWithFixedStream; import static org.junit.jupiter.api.Assertions.assertTrue; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; diff --git a/quarkus-cli/src/test/java/io/quarkus/ts/quarkus/cli/QuarkusCliExtensionsIT.java b/quarkus-cli/src/test/java/io/quarkus/ts/quarkus/cli/QuarkusCliExtensionsIT.java index 5f2fd04354..3a39e232a8 100644 --- a/quarkus-cli/src/test/java/io/quarkus/ts/quarkus/cli/QuarkusCliExtensionsIT.java +++ b/quarkus-cli/src/test/java/io/quarkus/ts/quarkus/cli/QuarkusCliExtensionsIT.java @@ -8,7 +8,7 @@ import java.util.Arrays; import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; diff --git a/quarkus-cli/src/test/java/io/quarkus/ts/quarkus/cli/QuarkusCliHelpIT.java b/quarkus-cli/src/test/java/io/quarkus/ts/quarkus/cli/QuarkusCliHelpIT.java index 6c79714584..298993fab8 100644 --- a/quarkus-cli/src/test/java/io/quarkus/ts/quarkus/cli/QuarkusCliHelpIT.java +++ b/quarkus-cli/src/test/java/io/quarkus/ts/quarkus/cli/QuarkusCliHelpIT.java @@ -2,7 +2,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; diff --git a/quarkus-cli/src/test/java/io/quarkus/ts/quarkus/cli/QuarkusCliSpecialCharsIT.java b/quarkus-cli/src/test/java/io/quarkus/ts/quarkus/cli/QuarkusCliSpecialCharsIT.java index 7b6b8c9ca6..4a7134d88e 100644 --- a/quarkus-cli/src/test/java/io/quarkus/ts/quarkus/cli/QuarkusCliSpecialCharsIT.java +++ b/quarkus-cli/src/test/java/io/quarkus/ts/quarkus/cli/QuarkusCliSpecialCharsIT.java @@ -9,7 +9,7 @@ import java.util.Arrays; import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Tag; diff --git a/quarkus-cli/src/test/java/io/quarkus/ts/quarkus/cli/QuarkusCliVersionIT.java b/quarkus-cli/src/test/java/io/quarkus/ts/quarkus/cli/QuarkusCliVersionIT.java index 4ff24672b7..a72aef4c94 100644 --- a/quarkus-cli/src/test/java/io/quarkus/ts/quarkus/cli/QuarkusCliVersionIT.java +++ b/quarkus-cli/src/test/java/io/quarkus/ts/quarkus/cli/QuarkusCliVersionIT.java @@ -2,7 +2,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Tag; diff --git a/qute/multimodule/qute-api/src/main/java/io/quarkus/ts/qute/api/MyQuteResource.java b/qute/multimodule/qute-api/src/main/java/io/quarkus/ts/qute/api/MyQuteResource.java index d02068b25e..c59ca17b0e 100644 --- a/qute/multimodule/qute-api/src/main/java/io/quarkus/ts/qute/api/MyQuteResource.java +++ b/qute/multimodule/qute-api/src/main/java/io/quarkus/ts/qute/api/MyQuteResource.java @@ -4,13 +4,13 @@ import java.util.Locale; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; import io.quarkus.qute.Template; import io.quarkus.qute.TemplateInstance; diff --git a/qute/reactive/src/main/java/io/quarkus/ts/qute/Application.java b/qute/reactive/src/main/java/io/quarkus/ts/qute/Application.java index c60f31dc2a..48d79fe3c1 100644 --- a/qute/reactive/src/main/java/io/quarkus/ts/qute/Application.java +++ b/qute/reactive/src/main/java/io/quarkus/ts/qute/Application.java @@ -9,18 +9,18 @@ import java.util.Map; import java.util.concurrent.CompletionStage; -import javax.inject.Inject; -import javax.ws.rs.DELETE; -import javax.ws.rs.DefaultValue; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.inject.Inject; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.DefaultValue; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import org.eclipse.microprofile.config.Config; import org.eclipse.microprofile.config.ConfigProvider; diff --git a/qute/reactive/src/test/java/io/quarkus/ts/qute/QuteReactiveIT.java b/qute/reactive/src/test/java/io/quarkus/ts/qute/QuteReactiveIT.java index 188de3c35c..e78e692508 100644 --- a/qute/reactive/src/test/java/io/quarkus/ts/qute/QuteReactiveIT.java +++ b/qute/reactive/src/test/java/io/quarkus/ts/qute/QuteReactiveIT.java @@ -8,7 +8,7 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import org.apache.http.HttpStatus; import org.junit.jupiter.api.Test; diff --git a/qute/synchronous/src/main/java/io/quarkus/ts/qute/Application.java b/qute/synchronous/src/main/java/io/quarkus/ts/qute/Application.java index 96ec09f79f..20be6080e3 100644 --- a/qute/synchronous/src/main/java/io/quarkus/ts/qute/Application.java +++ b/qute/synchronous/src/main/java/io/quarkus/ts/qute/Application.java @@ -8,18 +8,18 @@ import java.util.Locale; import java.util.Map; -import javax.inject.Inject; -import javax.ws.rs.DELETE; -import javax.ws.rs.DefaultValue; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.inject.Inject; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.DefaultValue; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import org.eclipse.microprofile.config.Config; import org.eclipse.microprofile.config.ConfigProvider; diff --git a/qute/synchronous/src/test/java/io/quarkus/ts/qute/QuteIT.java b/qute/synchronous/src/test/java/io/quarkus/ts/qute/QuteIT.java index bf9039dbf4..d859e9c097 100644 --- a/qute/synchronous/src/test/java/io/quarkus/ts/qute/QuteIT.java +++ b/qute/synchronous/src/test/java/io/quarkus/ts/qute/QuteIT.java @@ -8,7 +8,7 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import org.apache.http.HttpStatus; import org.junit.jupiter.api.Test; diff --git a/scaling/src/main/java/io/quarkus/ts/openshift/scaling/ScalingResource.java b/scaling/src/main/java/io/quarkus/ts/openshift/scaling/ScalingResource.java index f1f811a4b3..4efe0f9798 100644 --- a/scaling/src/main/java/io/quarkus/ts/openshift/scaling/ScalingResource.java +++ b/scaling/src/main/java/io/quarkus/ts/openshift/scaling/ScalingResource.java @@ -1,10 +1,10 @@ package io.quarkus.ts.openshift.scaling; -import javax.enterprise.event.Observes; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.enterprise.event.Observes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.jboss.logging.Logger; diff --git a/scaling/src/test/java/io/quarkus/ts/openshift/scaling/OpenShiftScalingIT.java b/scaling/src/test/java/io/quarkus/ts/openshift/scaling/OpenShiftScalingIT.java index 339c247ab0..1f6ca2bb56 100644 --- a/scaling/src/test/java/io/quarkus/ts/openshift/scaling/OpenShiftScalingIT.java +++ b/scaling/src/test/java/io/quarkus/ts/openshift/scaling/OpenShiftScalingIT.java @@ -1,7 +1,7 @@ package io.quarkus.ts.openshift.scaling; -import static javax.ws.rs.core.Response.Status.OK; -import static javax.ws.rs.core.Response.Status.SERVICE_UNAVAILABLE; +import static jakarta.ws.rs.core.Response.Status.OK; +import static jakarta.ws.rs.core.Response.Status.SERVICE_UNAVAILABLE; import static org.assertj.core.api.Assertions.assertThat; import static org.awaitility.Awaitility.await; import static org.awaitility.Awaitility.with; @@ -13,7 +13,7 @@ import java.util.Set; import java.util.concurrent.TimeUnit; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Order; diff --git a/scheduling/quartz/src/main/java/io/quarkus/ts/scheduling/quartz/basic/AnnotationScheduledCounter.java b/scheduling/quartz/src/main/java/io/quarkus/ts/scheduling/quartz/basic/AnnotationScheduledCounter.java index 673953fb4e..808fea137b 100644 --- a/scheduling/quartz/src/main/java/io/quarkus/ts/scheduling/quartz/basic/AnnotationScheduledCounter.java +++ b/scheduling/quartz/src/main/java/io/quarkus/ts/scheduling/quartz/basic/AnnotationScheduledCounter.java @@ -1,8 +1,8 @@ package io.quarkus.ts.scheduling.quartz.basic; -import javax.annotation.PostConstruct; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.annotation.PostConstruct; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import io.quarkus.scheduler.Scheduled; import io.quarkus.ts.scheduling.quartz.basic.services.CounterService; diff --git a/scheduling/quartz/src/main/java/io/quarkus/ts/scheduling/quartz/basic/CountResource.java b/scheduling/quartz/src/main/java/io/quarkus/ts/scheduling/quartz/basic/CountResource.java index 3ab4cee42d..86e06c17a8 100644 --- a/scheduling/quartz/src/main/java/io/quarkus/ts/scheduling/quartz/basic/CountResource.java +++ b/scheduling/quartz/src/main/java/io/quarkus/ts/scheduling/quartz/basic/CountResource.java @@ -1,10 +1,10 @@ package io.quarkus.ts.scheduling.quartz.basic; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; @Path("/scheduler/count") public class CountResource { diff --git a/scheduling/quartz/src/main/java/io/quarkus/ts/scheduling/quartz/basic/ManuallyScheduledCounter.java b/scheduling/quartz/src/main/java/io/quarkus/ts/scheduling/quartz/basic/ManuallyScheduledCounter.java index bd67eaf958..ebefb3fab8 100644 --- a/scheduling/quartz/src/main/java/io/quarkus/ts/scheduling/quartz/basic/ManuallyScheduledCounter.java +++ b/scheduling/quartz/src/main/java/io/quarkus/ts/scheduling/quartz/basic/ManuallyScheduledCounter.java @@ -1,10 +1,10 @@ package io.quarkus.ts.scheduling.quartz.basic; -import javax.annotation.PostConstruct; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import javax.inject.Provider; -import javax.transaction.Transactional; +import jakarta.annotation.PostConstruct; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; +import jakarta.inject.Provider; +import jakarta.transaction.Transactional; import org.eclipse.microprofile.config.inject.ConfigProperty; import org.quartz.Job; diff --git a/scheduling/quartz/src/main/java/io/quarkus/ts/scheduling/quartz/basic/services/CounterService.java b/scheduling/quartz/src/main/java/io/quarkus/ts/scheduling/quartz/basic/services/CounterService.java index e38991abf5..84bde6e46c 100644 --- a/scheduling/quartz/src/main/java/io/quarkus/ts/scheduling/quartz/basic/services/CounterService.java +++ b/scheduling/quartz/src/main/java/io/quarkus/ts/scheduling/quartz/basic/services/CounterService.java @@ -4,7 +4,7 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicInteger; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class CounterService { diff --git a/scheduling/quartz/src/main/java/io/quarkus/ts/scheduling/quartz/failover/AnnotationScheduledJob.java b/scheduling/quartz/src/main/java/io/quarkus/ts/scheduling/quartz/failover/AnnotationScheduledJob.java index eefa33c5cc..1b19511212 100644 --- a/scheduling/quartz/src/main/java/io/quarkus/ts/scheduling/quartz/failover/AnnotationScheduledJob.java +++ b/scheduling/quartz/src/main/java/io/quarkus/ts/scheduling/quartz/failover/AnnotationScheduledJob.java @@ -1,8 +1,8 @@ package io.quarkus.ts.scheduling.quartz.failover; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import javax.transaction.Transactional; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; +import jakarta.transaction.Transactional; import org.eclipse.microprofile.config.inject.ConfigProperty; diff --git a/scheduling/quartz/src/main/java/io/quarkus/ts/scheduling/quartz/failover/ExecutionEntity.java b/scheduling/quartz/src/main/java/io/quarkus/ts/scheduling/quartz/failover/ExecutionEntity.java index 29717eaca6..738081f317 100644 --- a/scheduling/quartz/src/main/java/io/quarkus/ts/scheduling/quartz/failover/ExecutionEntity.java +++ b/scheduling/quartz/src/main/java/io/quarkus/ts/scheduling/quartz/failover/ExecutionEntity.java @@ -1,6 +1,6 @@ package io.quarkus.ts.scheduling.quartz.failover; -import javax.persistence.Entity; +import jakarta.persistence.Entity; import io.quarkus.hibernate.orm.panache.PanacheEntity; diff --git a/scheduling/quartz/src/main/java/io/quarkus/ts/scheduling/quartz/failover/ExecutionService.java b/scheduling/quartz/src/main/java/io/quarkus/ts/scheduling/quartz/failover/ExecutionService.java index 7bd3ed536e..b973e3d87f 100644 --- a/scheduling/quartz/src/main/java/io/quarkus/ts/scheduling/quartz/failover/ExecutionService.java +++ b/scheduling/quartz/src/main/java/io/quarkus/ts/scheduling/quartz/failover/ExecutionService.java @@ -2,9 +2,9 @@ import java.time.Instant; -import javax.enterprise.context.ApplicationScoped; -import javax.transaction.Transactional; -import javax.transaction.Transactional.TxType; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.transaction.Transactional; +import jakarta.transaction.Transactional.TxType; @ApplicationScoped public class ExecutionService { diff --git a/scheduling/quartz/src/main/java/io/quarkus/ts/scheduling/quartz/failover/ExecutionsResource.java b/scheduling/quartz/src/main/java/io/quarkus/ts/scheduling/quartz/failover/ExecutionsResource.java index 5b42c48d82..a0df408552 100644 --- a/scheduling/quartz/src/main/java/io/quarkus/ts/scheduling/quartz/failover/ExecutionsResource.java +++ b/scheduling/quartz/src/main/java/io/quarkus/ts/scheduling/quartz/failover/ExecutionsResource.java @@ -2,10 +2,10 @@ import java.util.List; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; @Path("/executions") public class ExecutionsResource { diff --git a/scheduling/spring/src/main/java/io/quarkus/qe/scheduling/spring/AnnotationScheduledCounter.java b/scheduling/spring/src/main/java/io/quarkus/qe/scheduling/spring/AnnotationScheduledCounter.java index 450e51298e..3c3a6eeeb6 100644 --- a/scheduling/spring/src/main/java/io/quarkus/qe/scheduling/spring/AnnotationScheduledCounter.java +++ b/scheduling/spring/src/main/java/io/quarkus/qe/scheduling/spring/AnnotationScheduledCounter.java @@ -1,6 +1,6 @@ package io.quarkus.qe.scheduling.spring; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Scheduled; diff --git a/scheduling/spring/src/main/java/io/quarkus/qe/scheduling/spring/CountResource.java b/scheduling/spring/src/main/java/io/quarkus/qe/scheduling/spring/CountResource.java index 046fde6c73..c5675de9c1 100644 --- a/scheduling/spring/src/main/java/io/quarkus/qe/scheduling/spring/CountResource.java +++ b/scheduling/spring/src/main/java/io/quarkus/qe/scheduling/spring/CountResource.java @@ -1,6 +1,6 @@ package io.quarkus.qe.scheduling.spring; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; diff --git a/scheduling/spring/src/main/java/io/quarkus/qe/scheduling/spring/services/CounterService.java b/scheduling/spring/src/main/java/io/quarkus/qe/scheduling/spring/services/CounterService.java index 14057418f6..a474e09120 100644 --- a/scheduling/spring/src/main/java/io/quarkus/qe/scheduling/spring/services/CounterService.java +++ b/scheduling/spring/src/main/java/io/quarkus/qe/scheduling/spring/services/CounterService.java @@ -4,7 +4,7 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicInteger; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class CounterService { diff --git a/security/basic/src/main/java/io/quarkus/ts/openshift/security/basic/AdminResource.java b/security/basic/src/main/java/io/quarkus/ts/openshift/security/basic/AdminResource.java index b7f9f7fe1a..0e2750292d 100644 --- a/security/basic/src/main/java/io/quarkus/ts/openshift/security/basic/AdminResource.java +++ b/security/basic/src/main/java/io/quarkus/ts/openshift/security/basic/AdminResource.java @@ -1,10 +1,10 @@ package io.quarkus.ts.openshift.security.basic; -import javax.annotation.security.RolesAllowed; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.SecurityContext; +import jakarta.annotation.security.RolesAllowed; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.SecurityContext; @Path("/admin") @RolesAllowed("admin") diff --git a/security/basic/src/main/java/io/quarkus/ts/openshift/security/basic/DenyAllResource.java b/security/basic/src/main/java/io/quarkus/ts/openshift/security/basic/DenyAllResource.java index 230bd92acd..8964c2bbe6 100644 --- a/security/basic/src/main/java/io/quarkus/ts/openshift/security/basic/DenyAllResource.java +++ b/security/basic/src/main/java/io/quarkus/ts/openshift/security/basic/DenyAllResource.java @@ -1,10 +1,10 @@ package io.quarkus.ts.openshift.security.basic; -import javax.annotation.security.DenyAll; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.SecurityContext; +import jakarta.annotation.security.DenyAll; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.SecurityContext; @Path("/deny-all") @DenyAll diff --git a/security/basic/src/main/java/io/quarkus/ts/openshift/security/basic/EveryoneResource.java b/security/basic/src/main/java/io/quarkus/ts/openshift/security/basic/EveryoneResource.java index 073ecddb9d..eec1fef829 100644 --- a/security/basic/src/main/java/io/quarkus/ts/openshift/security/basic/EveryoneResource.java +++ b/security/basic/src/main/java/io/quarkus/ts/openshift/security/basic/EveryoneResource.java @@ -1,10 +1,10 @@ package io.quarkus.ts.openshift.security.basic; -import javax.annotation.security.RolesAllowed; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.SecurityContext; +import jakarta.annotation.security.RolesAllowed; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.SecurityContext; @Path("/everyone") @RolesAllowed("**") diff --git a/security/basic/src/main/java/io/quarkus/ts/openshift/security/basic/PermitAllResource.java b/security/basic/src/main/java/io/quarkus/ts/openshift/security/basic/PermitAllResource.java index 53be959b2f..fa0fdc5299 100644 --- a/security/basic/src/main/java/io/quarkus/ts/openshift/security/basic/PermitAllResource.java +++ b/security/basic/src/main/java/io/quarkus/ts/openshift/security/basic/PermitAllResource.java @@ -1,10 +1,10 @@ package io.quarkus.ts.openshift.security.basic; -import javax.annotation.security.PermitAll; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.SecurityContext; +import jakarta.annotation.security.PermitAll; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.SecurityContext; @Path("/permit-all") @PermitAll diff --git a/security/basic/src/main/java/io/quarkus/ts/openshift/security/basic/UnannotatedResource.java b/security/basic/src/main/java/io/quarkus/ts/openshift/security/basic/UnannotatedResource.java index 8cc080f737..45f907b8da 100644 --- a/security/basic/src/main/java/io/quarkus/ts/openshift/security/basic/UnannotatedResource.java +++ b/security/basic/src/main/java/io/quarkus/ts/openshift/security/basic/UnannotatedResource.java @@ -1,9 +1,9 @@ package io.quarkus.ts.openshift.security.basic; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.SecurityContext; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.SecurityContext; @Path("/unannotated") public class UnannotatedResource { diff --git a/security/basic/src/main/java/io/quarkus/ts/openshift/security/basic/UserResource.java b/security/basic/src/main/java/io/quarkus/ts/openshift/security/basic/UserResource.java index 3b2c36b604..2aab38b23f 100644 --- a/security/basic/src/main/java/io/quarkus/ts/openshift/security/basic/UserResource.java +++ b/security/basic/src/main/java/io/quarkus/ts/openshift/security/basic/UserResource.java @@ -1,10 +1,10 @@ package io.quarkus.ts.openshift.security.basic; -import javax.annotation.security.RolesAllowed; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.SecurityContext; +import jakarta.annotation.security.RolesAllowed; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.SecurityContext; @Path("/user") @RolesAllowed("user") diff --git a/security/bouncycastle-fips/bcFipsJsse/src/main/java/io/quarkus/ts/security/bouncycastle/fips/jsse/BouncyCastleFipsJsseEndpoint.java b/security/bouncycastle-fips/bcFipsJsse/src/main/java/io/quarkus/ts/security/bouncycastle/fips/jsse/BouncyCastleFipsJsseEndpoint.java index 22402b79be..671cf09960 100644 --- a/security/bouncycastle-fips/bcFipsJsse/src/main/java/io/quarkus/ts/security/bouncycastle/fips/jsse/BouncyCastleFipsJsseEndpoint.java +++ b/security/bouncycastle-fips/bcFipsJsse/src/main/java/io/quarkus/ts/security/bouncycastle/fips/jsse/BouncyCastleFipsJsseEndpoint.java @@ -5,8 +5,8 @@ import java.util.Arrays; import java.util.stream.Collectors; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; @Path("/api") public class BouncyCastleFipsJsseEndpoint { diff --git a/security/bouncycastle-fips/bcFipsJsse/src/test/java/io/quarkus/ts/security/bouncycastle/fips/jsse/BouncyCastleFipsJsseIT.java b/security/bouncycastle-fips/bcFipsJsse/src/test/java/io/quarkus/ts/security/bouncycastle/fips/jsse/BouncyCastleFipsJsseIT.java index 12235e0ef5..395a973405 100644 --- a/security/bouncycastle-fips/bcFipsJsse/src/test/java/io/quarkus/ts/security/bouncycastle/fips/jsse/BouncyCastleFipsJsseIT.java +++ b/security/bouncycastle-fips/bcFipsJsse/src/test/java/io/quarkus/ts/security/bouncycastle/fips/jsse/BouncyCastleFipsJsseIT.java @@ -11,7 +11,7 @@ import java.nio.file.Paths; import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.bouncycastle.jcajce.provider.BouncyCastleFipsProvider; import org.junit.jupiter.api.Tag; diff --git a/security/bouncycastle-fips/bcfips/src/main/java/io/quarkus/ts/security/bouncycastle/fips/BouncyCastleFipsEndpoint.java b/security/bouncycastle-fips/bcfips/src/main/java/io/quarkus/ts/security/bouncycastle/fips/BouncyCastleFipsEndpoint.java index 304d34189e..0030b3a48f 100644 --- a/security/bouncycastle-fips/bcfips/src/main/java/io/quarkus/ts/security/bouncycastle/fips/BouncyCastleFipsEndpoint.java +++ b/security/bouncycastle-fips/bcfips/src/main/java/io/quarkus/ts/security/bouncycastle/fips/BouncyCastleFipsEndpoint.java @@ -5,8 +5,8 @@ import java.util.Arrays; import java.util.stream.Collectors; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; @Path("/api") public class BouncyCastleFipsEndpoint { diff --git a/security/form-authn/src/main/java/io/quarkus/ts/security/form/authn/UserResource.java b/security/form-authn/src/main/java/io/quarkus/ts/security/form/authn/UserResource.java index df9fec3291..5e6c2c1337 100644 --- a/security/form-authn/src/main/java/io/quarkus/ts/security/form/authn/UserResource.java +++ b/security/form-authn/src/main/java/io/quarkus/ts/security/form/authn/UserResource.java @@ -1,10 +1,10 @@ package io.quarkus.ts.security.form.authn; -import javax.annotation.security.RolesAllowed; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.SecurityContext; +import jakarta.annotation.security.RolesAllowed; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.SecurityContext; @Path("/user") @RolesAllowed("user") diff --git a/security/https/src/main/java/io/quarkus/ts/security/https/CertificateRolesAugmentor.java b/security/https/src/main/java/io/quarkus/ts/security/https/CertificateRolesAugmentor.java index d416a65194..a0a0b4fb67 100644 --- a/security/https/src/main/java/io/quarkus/ts/security/https/CertificateRolesAugmentor.java +++ b/security/https/src/main/java/io/quarkus/ts/security/https/CertificateRolesAugmentor.java @@ -4,7 +4,7 @@ import java.util.Collections; import java.util.Set; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import io.quarkus.security.credential.CertificateCredential; import io.quarkus.security.identity.AuthenticationRequestContext; diff --git a/security/https/src/main/java/io/quarkus/ts/security/https/HelloResource.java b/security/https/src/main/java/io/quarkus/ts/security/https/HelloResource.java index b82618782e..b78cfb2ef8 100644 --- a/security/https/src/main/java/io/quarkus/ts/security/https/HelloResource.java +++ b/security/https/src/main/java/io/quarkus/ts/security/https/HelloResource.java @@ -1,11 +1,11 @@ package io.quarkus.ts.security.https; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.SecurityContext; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.SecurityContext; @Path("/hello") public class HelloResource { diff --git a/security/https/src/main/java/io/quarkus/ts/security/https/SecuredResource.java b/security/https/src/main/java/io/quarkus/ts/security/https/SecuredResource.java index 822245b9b4..1c71c85a9d 100644 --- a/security/https/src/main/java/io/quarkus/ts/security/https/SecuredResource.java +++ b/security/https/src/main/java/io/quarkus/ts/security/https/SecuredResource.java @@ -2,11 +2,11 @@ import java.security.cert.X509Certificate; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import io.quarkus.security.credential.CertificateCredential; import io.quarkus.security.identity.SecurityIdentity; diff --git a/security/https/src/test/java/io/quarkus/ts/security/https/enabled/BaseEnabledHttpsSecurityIT.java b/security/https/src/test/java/io/quarkus/ts/security/https/enabled/BaseEnabledHttpsSecurityIT.java index fbba043006..31887ea5ad 100644 --- a/security/https/src/test/java/io/quarkus/ts/security/https/enabled/BaseEnabledHttpsSecurityIT.java +++ b/security/https/src/test/java/io/quarkus/ts/security/https/enabled/BaseEnabledHttpsSecurityIT.java @@ -6,8 +6,6 @@ import java.io.IOException; import java.security.GeneralSecurityException; -import javax.net.ssl.SSLContext; - import org.apache.http.client.fluent.Executor; import org.apache.http.client.fluent.Request; import org.apache.http.conn.ssl.DefaultHostnameVerifier; @@ -22,6 +20,8 @@ import io.quarkus.ts.security.https.utils.Certificates; import io.quarkus.ts.security.https.utils.HttpsAssertions; +import javax.net.ssl.SSLContext; + public abstract class BaseEnabledHttpsSecurityIT { // not using RestAssured because we want 100% control over certificate & hostname verification diff --git a/security/https/src/test/java/io/quarkus/ts/security/https/redirect/BaseRedirectHttpsSecurityIT.java b/security/https/src/test/java/io/quarkus/ts/security/https/redirect/BaseRedirectHttpsSecurityIT.java index f131c3bb97..d8d397924d 100644 --- a/security/https/src/test/java/io/quarkus/ts/security/https/redirect/BaseRedirectHttpsSecurityIT.java +++ b/security/https/src/test/java/io/quarkus/ts/security/https/redirect/BaseRedirectHttpsSecurityIT.java @@ -6,8 +6,6 @@ import java.io.IOException; import java.security.GeneralSecurityException; -import javax.net.ssl.SSLContext; - import org.apache.http.HttpResponse; import org.apache.http.HttpStatus; import org.apache.http.client.fluent.Executor; @@ -23,6 +21,8 @@ import io.quarkus.ts.security.https.utils.Certificates; import io.quarkus.ts.security.https.utils.HttpsAssertions; +import javax.net.ssl.SSLContext; + public abstract class BaseRedirectHttpsSecurityIT { // not using RestAssured because we want 100% control over certificate & hostname verification diff --git a/security/https/src/test/java/io/quarkus/ts/security/https/secured/BaseAuthzHttpsSecurityIT.java b/security/https/src/test/java/io/quarkus/ts/security/https/secured/BaseAuthzHttpsSecurityIT.java index f26a2c91aa..bac812c68b 100644 --- a/security/https/src/test/java/io/quarkus/ts/security/https/secured/BaseAuthzHttpsSecurityIT.java +++ b/security/https/src/test/java/io/quarkus/ts/security/https/secured/BaseAuthzHttpsSecurityIT.java @@ -6,8 +6,6 @@ import java.io.IOException; import java.security.GeneralSecurityException; -import javax.net.ssl.SSLContext; - import org.apache.http.HttpResponse; import org.apache.http.HttpStatus; import org.apache.http.client.config.RequestConfig; @@ -25,6 +23,8 @@ import io.quarkus.ts.security.https.utils.Certificates; import io.quarkus.ts.security.https.utils.HttpsAssertions; +import javax.net.ssl.SSLContext; + public abstract class BaseAuthzHttpsSecurityIT { // not using RestAssured because we want 100% control over certificate & hostname verification diff --git a/security/https/src/test/java/io/quarkus/ts/security/https/utils/HttpsAssertions.java b/security/https/src/test/java/io/quarkus/ts/security/https/utils/HttpsAssertions.java index 56e3fcee82..3332e18c7c 100644 --- a/security/https/src/test/java/io/quarkus/ts/security/https/utils/HttpsAssertions.java +++ b/security/https/src/test/java/io/quarkus/ts/security/https/utils/HttpsAssertions.java @@ -5,13 +5,13 @@ import java.net.SocketException; import java.security.NoSuchAlgorithmException; +import org.junit.jupiter.api.function.Executable; +import org.opentest4j.AssertionFailedError; + import javax.net.ssl.SSLContext; import javax.net.ssl.SSLException; import javax.net.ssl.SSLHandshakeException; -import org.junit.jupiter.api.function.Executable; -import org.opentest4j.AssertionFailedError; - public final class HttpsAssertions { private HttpsAssertions() { // avoid instantiation diff --git a/security/jwt/src/main/java/io/quarkus/ts/security/jwt/ContentTypesResource.java b/security/jwt/src/main/java/io/quarkus/ts/security/jwt/ContentTypesResource.java index b91d792af4..961b19e139 100644 --- a/security/jwt/src/main/java/io/quarkus/ts/security/jwt/ContentTypesResource.java +++ b/security/jwt/src/main/java/io/quarkus/ts/security/jwt/ContentTypesResource.java @@ -1,10 +1,10 @@ package io.quarkus.ts.security.jwt; -import javax.annotation.security.RolesAllowed; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.annotation.security.RolesAllowed; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; @Path("/content-types") public class ContentTypesResource { diff --git a/security/jwt/src/main/java/io/quarkus/ts/security/jwt/DeniedResource.java b/security/jwt/src/main/java/io/quarkus/ts/security/jwt/DeniedResource.java index ae6563f912..f99e70c133 100644 --- a/security/jwt/src/main/java/io/quarkus/ts/security/jwt/DeniedResource.java +++ b/security/jwt/src/main/java/io/quarkus/ts/security/jwt/DeniedResource.java @@ -1,8 +1,8 @@ package io.quarkus.ts.security.jwt; -import javax.annotation.security.DenyAll; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.annotation.security.DenyAll; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; @DenyAll @Path("/denied") diff --git a/security/jwt/src/main/java/io/quarkus/ts/security/jwt/GenerateJwtResource.java b/security/jwt/src/main/java/io/quarkus/ts/security/jwt/GenerateJwtResource.java index 934fbcabcc..ab9713d6cc 100644 --- a/security/jwt/src/main/java/io/quarkus/ts/security/jwt/GenerateJwtResource.java +++ b/security/jwt/src/main/java/io/quarkus/ts/security/jwt/GenerateJwtResource.java @@ -10,13 +10,13 @@ import java.util.Set; import java.util.concurrent.TimeUnit; -import javax.annotation.security.PermitAll; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; +import jakarta.annotation.security.PermitAll; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; import io.smallrye.jwt.build.Jwt; import io.smallrye.jwt.build.JwtClaimsBuilder; diff --git a/security/jwt/src/main/java/io/quarkus/ts/security/jwt/GraphQLResource.java b/security/jwt/src/main/java/io/quarkus/ts/security/jwt/GraphQLResource.java index 5c621172a9..ff77cef067 100644 --- a/security/jwt/src/main/java/io/quarkus/ts/security/jwt/GraphQLResource.java +++ b/security/jwt/src/main/java/io/quarkus/ts/security/jwt/GraphQLResource.java @@ -1,6 +1,6 @@ package io.quarkus.ts.security.jwt; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.eclipse.microprofile.graphql.GraphQLApi; import org.eclipse.microprofile.graphql.Query; diff --git a/security/jwt/src/main/java/io/quarkus/ts/security/jwt/MixedResource.java b/security/jwt/src/main/java/io/quarkus/ts/security/jwt/MixedResource.java index 064b211aa4..92ab3536e3 100644 --- a/security/jwt/src/main/java/io/quarkus/ts/security/jwt/MixedResource.java +++ b/security/jwt/src/main/java/io/quarkus/ts/security/jwt/MixedResource.java @@ -1,8 +1,8 @@ package io.quarkus.ts.security.jwt; -import javax.annotation.security.RolesAllowed; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.annotation.security.RolesAllowed; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; @Path("/mixed") public class MixedResource { diff --git a/security/jwt/src/main/java/io/quarkus/ts/security/jwt/ParameterizedPathsResource.java b/security/jwt/src/main/java/io/quarkus/ts/security/jwt/ParameterizedPathsResource.java index 5b9bc41355..e62ff9f536 100644 --- a/security/jwt/src/main/java/io/quarkus/ts/security/jwt/ParameterizedPathsResource.java +++ b/security/jwt/src/main/java/io/quarkus/ts/security/jwt/ParameterizedPathsResource.java @@ -1,9 +1,9 @@ package io.quarkus.ts.security.jwt; -import javax.annotation.security.RolesAllowed; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; +import jakarta.annotation.security.RolesAllowed; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; @Path("/parameterized-paths") public class ParameterizedPathsResource { diff --git a/security/jwt/src/main/java/io/quarkus/ts/security/jwt/PermittedResource.java b/security/jwt/src/main/java/io/quarkus/ts/security/jwt/PermittedResource.java index cf174ef8bc..145ad685ee 100644 --- a/security/jwt/src/main/java/io/quarkus/ts/security/jwt/PermittedResource.java +++ b/security/jwt/src/main/java/io/quarkus/ts/security/jwt/PermittedResource.java @@ -1,9 +1,9 @@ package io.quarkus.ts.security.jwt; -import javax.annotation.security.PermitAll; -import javax.annotation.security.RolesAllowed; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.annotation.security.PermitAll; +import jakarta.annotation.security.RolesAllowed; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; @RolesAllowed("admin") @Path("/permitted") diff --git a/security/jwt/src/main/java/io/quarkus/ts/security/jwt/SecuredResource.java b/security/jwt/src/main/java/io/quarkus/ts/security/jwt/SecuredResource.java index 4000f6cf96..0fd6adf690 100644 --- a/security/jwt/src/main/java/io/quarkus/ts/security/jwt/SecuredResource.java +++ b/security/jwt/src/main/java/io/quarkus/ts/security/jwt/SecuredResource.java @@ -2,14 +2,14 @@ import java.util.Set; -import javax.annotation.security.DenyAll; -import javax.annotation.security.RolesAllowed; -import javax.enterprise.context.RequestScoped; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.SecurityContext; +import jakarta.annotation.security.DenyAll; +import jakarta.annotation.security.RolesAllowed; +import jakarta.enterprise.context.RequestScoped; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.SecurityContext; import org.eclipse.microprofile.jwt.Claim; import org.eclipse.microprofile.jwt.Claims; diff --git a/security/keycloak-authz-classic/src/main/java/io/quarkus/ts/security/keycloak/authz/AdminResource.java b/security/keycloak-authz-classic/src/main/java/io/quarkus/ts/security/keycloak/authz/AdminResource.java index 8943699fc6..8e609dd233 100644 --- a/security/keycloak-authz-classic/src/main/java/io/quarkus/ts/security/keycloak/authz/AdminResource.java +++ b/security/keycloak-authz-classic/src/main/java/io/quarkus/ts/security/keycloak/authz/AdminResource.java @@ -1,10 +1,10 @@ package io.quarkus.ts.security.keycloak.authz; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.eclipse.microprofile.jwt.JsonWebToken; diff --git a/security/keycloak-authz-classic/src/main/java/io/quarkus/ts/security/keycloak/authz/UserResource.java b/security/keycloak-authz-classic/src/main/java/io/quarkus/ts/security/keycloak/authz/UserResource.java index 1ceb3fa3ba..e11ed158b7 100644 --- a/security/keycloak-authz-classic/src/main/java/io/quarkus/ts/security/keycloak/authz/UserResource.java +++ b/security/keycloak-authz-classic/src/main/java/io/quarkus/ts/security/keycloak/authz/UserResource.java @@ -1,10 +1,10 @@ package io.quarkus.ts.security.keycloak.authz; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.eclipse.microprofile.jwt.JsonWebToken; diff --git a/security/keycloak-authz-reactive/src/main/java/io/quarkus/ts/security/keycloak/authz/reactive/AdminResource.java b/security/keycloak-authz-reactive/src/main/java/io/quarkus/ts/security/keycloak/authz/reactive/AdminResource.java index aa40498d7d..a469081137 100644 --- a/security/keycloak-authz-reactive/src/main/java/io/quarkus/ts/security/keycloak/authz/reactive/AdminResource.java +++ b/security/keycloak-authz-reactive/src/main/java/io/quarkus/ts/security/keycloak/authz/reactive/AdminResource.java @@ -1,10 +1,10 @@ package io.quarkus.ts.security.keycloak.authz.reactive; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.eclipse.microprofile.jwt.JsonWebToken; diff --git a/security/keycloak-authz-reactive/src/main/java/io/quarkus/ts/security/keycloak/authz/reactive/UserAdvancedResource.java b/security/keycloak-authz-reactive/src/main/java/io/quarkus/ts/security/keycloak/authz/reactive/UserAdvancedResource.java index b3af8ee260..b620e17f80 100644 --- a/security/keycloak-authz-reactive/src/main/java/io/quarkus/ts/security/keycloak/authz/reactive/UserAdvancedResource.java +++ b/security/keycloak-authz-reactive/src/main/java/io/quarkus/ts/security/keycloak/authz/reactive/UserAdvancedResource.java @@ -1,7 +1,7 @@ package io.quarkus.ts.security.keycloak.authz.reactive; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import io.quarkus.security.Authenticated; import io.smallrye.mutiny.Uni; diff --git a/security/keycloak-authz-reactive/src/main/java/io/quarkus/ts/security/keycloak/authz/reactive/UserDetailsResource.java b/security/keycloak-authz-reactive/src/main/java/io/quarkus/ts/security/keycloak/authz/reactive/UserDetailsResource.java index 8a048d0b93..66e12d25d6 100644 --- a/security/keycloak-authz-reactive/src/main/java/io/quarkus/ts/security/keycloak/authz/reactive/UserDetailsResource.java +++ b/security/keycloak-authz-reactive/src/main/java/io/quarkus/ts/security/keycloak/authz/reactive/UserDetailsResource.java @@ -1,11 +1,11 @@ package io.quarkus.ts.security.keycloak.authz.reactive; -import javax.inject.Inject; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import io.quarkus.security.identity.SecurityIdentity; import io.smallrye.mutiny.Uni; diff --git a/security/keycloak-authz-reactive/src/main/java/io/quarkus/ts/security/keycloak/authz/reactive/UserResource.java b/security/keycloak-authz-reactive/src/main/java/io/quarkus/ts/security/keycloak/authz/reactive/UserResource.java index 682e2a894c..73b348e0b4 100644 --- a/security/keycloak-authz-reactive/src/main/java/io/quarkus/ts/security/keycloak/authz/reactive/UserResource.java +++ b/security/keycloak-authz-reactive/src/main/java/io/quarkus/ts/security/keycloak/authz/reactive/UserResource.java @@ -1,10 +1,10 @@ package io.quarkus.ts.security.keycloak.authz.reactive; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.eclipse.microprofile.jwt.JsonWebToken; diff --git a/security/keycloak-authz-reactive/src/test/java/io/quarkus/ts/security/keycloak/authz/reactive/BaseAuthzSecurityReactiveIT.java b/security/keycloak-authz-reactive/src/test/java/io/quarkus/ts/security/keycloak/authz/reactive/BaseAuthzSecurityReactiveIT.java index 64f2f939b1..5ca6df759c 100644 --- a/security/keycloak-authz-reactive/src/test/java/io/quarkus/ts/security/keycloak/authz/reactive/BaseAuthzSecurityReactiveIT.java +++ b/security/keycloak-authz-reactive/src/test/java/io/quarkus/ts/security/keycloak/authz/reactive/BaseAuthzSecurityReactiveIT.java @@ -107,17 +107,17 @@ public void noUserAdminResource() { } private void thenBodyIs(String expectedBody) { - String bodyAsString = response.await().assertCompleted().getItem().bodyAsString(); + String bodyAsString = response.awaitItem().assertCompleted().getItem().bodyAsString(); assertThat(expectedBody, equalTo(bodyAsString)); } private void thenBodyStartWith(String expectedBody) { - String bodyAsString = response.await().assertCompleted().getItem().bodyAsString(); + String bodyAsString = response.awaitItem().assertCompleted().getItem().bodyAsString(); assertThat(bodyAsString, startsWith(expectedBody)); } private void thenStatusCodeIs(int expectedCode) { - int statusCode = response.await().assertCompleted().getItem().statusCode(); + int statusCode = response.awaitItem().assertCompleted().getItem().statusCode(); assertThat(expectedCode, equalTo(statusCode)); } diff --git a/security/keycloak-jwt/src/main/java/io/quarkus/ts/security/keycloak/jwt/SecuredResource.java b/security/keycloak-jwt/src/main/java/io/quarkus/ts/security/keycloak/jwt/SecuredResource.java index 9afe26c8bd..6ebd0613a1 100644 --- a/security/keycloak-jwt/src/main/java/io/quarkus/ts/security/keycloak/jwt/SecuredResource.java +++ b/security/keycloak-jwt/src/main/java/io/quarkus/ts/security/keycloak/jwt/SecuredResource.java @@ -1,12 +1,12 @@ package io.quarkus.ts.security.keycloak.jwt; -import javax.annotation.security.RolesAllowed; -import javax.enterprise.context.RequestScoped; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.SecurityContext; +import jakarta.annotation.security.RolesAllowed; +import jakarta.enterprise.context.RequestScoped; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.SecurityContext; import org.eclipse.microprofile.jwt.Claim; import org.eclipse.microprofile.jwt.Claims; diff --git a/security/keycloak-multitenant/src/main/java/io/quarkus/ts/security/keycloak/multitenant/CustomTenantResolver.java b/security/keycloak-multitenant/src/main/java/io/quarkus/ts/security/keycloak/multitenant/CustomTenantResolver.java index af505e6db9..f7c2c799f4 100644 --- a/security/keycloak-multitenant/src/main/java/io/quarkus/ts/security/keycloak/multitenant/CustomTenantResolver.java +++ b/security/keycloak-multitenant/src/main/java/io/quarkus/ts/security/keycloak/multitenant/CustomTenantResolver.java @@ -2,7 +2,7 @@ import java.util.stream.Stream; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import io.quarkus.oidc.TenantResolver; import io.vertx.ext.web.RoutingContext; diff --git a/security/keycloak-multitenant/src/main/java/io/quarkus/ts/security/keycloak/multitenant/UserResource.java b/security/keycloak-multitenant/src/main/java/io/quarkus/ts/security/keycloak/multitenant/UserResource.java index bf8a4b93fb..161cd1ced5 100644 --- a/security/keycloak-multitenant/src/main/java/io/quarkus/ts/security/keycloak/multitenant/UserResource.java +++ b/security/keycloak-multitenant/src/main/java/io/quarkus/ts/security/keycloak/multitenant/UserResource.java @@ -1,10 +1,10 @@ package io.quarkus.ts.security.keycloak.multitenant; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import io.quarkus.security.Authenticated; import io.quarkus.security.identity.SecurityIdentity; diff --git a/security/keycloak-oauth2/src/main/java/io/quarkus/ts/security/keycloak/oauth2/AdminResource.java b/security/keycloak-oauth2/src/main/java/io/quarkus/ts/security/keycloak/oauth2/AdminResource.java index ec98621394..138fb1a9ad 100644 --- a/security/keycloak-oauth2/src/main/java/io/quarkus/ts/security/keycloak/oauth2/AdminResource.java +++ b/security/keycloak-oauth2/src/main/java/io/quarkus/ts/security/keycloak/oauth2/AdminResource.java @@ -1,11 +1,11 @@ package io.quarkus.ts.security.keycloak.oauth2; -import javax.annotation.security.RolesAllowed; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.annotation.security.RolesAllowed; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import io.quarkus.security.identity.SecurityIdentity; diff --git a/security/keycloak-oauth2/src/main/java/io/quarkus/ts/security/keycloak/oauth2/UserResource.java b/security/keycloak-oauth2/src/main/java/io/quarkus/ts/security/keycloak/oauth2/UserResource.java index 8b4f020ec5..e27abbf612 100644 --- a/security/keycloak-oauth2/src/main/java/io/quarkus/ts/security/keycloak/oauth2/UserResource.java +++ b/security/keycloak-oauth2/src/main/java/io/quarkus/ts/security/keycloak/oauth2/UserResource.java @@ -1,11 +1,11 @@ package io.quarkus.ts.security.keycloak.oauth2; -import javax.annotation.security.RolesAllowed; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.annotation.security.RolesAllowed; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import io.quarkus.security.identity.SecurityIdentity; diff --git a/security/keycloak-oidc-client-basic/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/basic/AdminResource.java b/security/keycloak-oidc-client-basic/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/basic/AdminResource.java index 276d287fce..fe480806eb 100644 --- a/security/keycloak-oidc-client-basic/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/basic/AdminResource.java +++ b/security/keycloak-oidc-client-basic/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/basic/AdminResource.java @@ -1,11 +1,11 @@ package io.quarkus.ts.security.keycloak.oidcclient.basic; -import javax.annotation.security.RolesAllowed; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.annotation.security.RolesAllowed; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import io.quarkus.security.identity.SecurityIdentity; diff --git a/security/keycloak-oidc-client-basic/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/basic/SecuredResource.java b/security/keycloak-oidc-client-basic/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/basic/SecuredResource.java index 8d4ed2fce9..f92da1ae49 100644 --- a/security/keycloak-oidc-client-basic/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/basic/SecuredResource.java +++ b/security/keycloak-oidc-client-basic/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/basic/SecuredResource.java @@ -1,9 +1,9 @@ package io.quarkus.ts.security.keycloak.oidcclient.basic; -import javax.annotation.security.RolesAllowed; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.annotation.security.RolesAllowed; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import io.quarkus.security.identity.SecurityIdentity; diff --git a/security/keycloak-oidc-client-basic/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/basic/TokenProviderResource.java b/security/keycloak-oidc-client-basic/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/basic/TokenProviderResource.java index a6b18715bc..39ae65c16f 100644 --- a/security/keycloak-oidc-client-basic/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/basic/TokenProviderResource.java +++ b/security/keycloak-oidc-client-basic/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/basic/TokenProviderResource.java @@ -1,8 +1,8 @@ package io.quarkus.ts.security.keycloak.oidcclient.basic; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import io.quarkus.oidc.client.OidcClient; import io.quarkus.oidc.client.OidcClients; diff --git a/security/keycloak-oidc-client-basic/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/basic/UserResource.java b/security/keycloak-oidc-client-basic/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/basic/UserResource.java index 7f22bac1b0..062f9d3dbb 100644 --- a/security/keycloak-oidc-client-basic/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/basic/UserResource.java +++ b/security/keycloak-oidc-client-basic/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/basic/UserResource.java @@ -1,11 +1,11 @@ package io.quarkus.ts.security.keycloak.oidcclient.basic; -import javax.annotation.security.RolesAllowed; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.annotation.security.RolesAllowed; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.eclipse.microprofile.jwt.JsonWebToken; diff --git a/security/keycloak-oidc-client-extended/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/extended/restclient/ping/AutoAcquireTokenPingResource.java b/security/keycloak-oidc-client-extended/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/extended/restclient/ping/AutoAcquireTokenPingResource.java index 8ba1a8cd2a..365e714d42 100644 --- a/security/keycloak-oidc-client-extended/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/extended/restclient/ping/AutoAcquireTokenPingResource.java +++ b/security/keycloak-oidc-client-extended/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/extended/restclient/ping/AutoAcquireTokenPingResource.java @@ -1,14 +1,14 @@ package io.quarkus.ts.security.keycloak.oidcclient.extended.restclient.ping; -import javax.inject.Inject; -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.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +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.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.eclipse.microprofile.rest.client.inject.RestClient; diff --git a/security/keycloak-oidc-client-extended/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/extended/restclient/ping/LookupAuthorizationPingResource.java b/security/keycloak-oidc-client-extended/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/extended/restclient/ping/LookupAuthorizationPingResource.java index a199a9e9e6..5293ea4db5 100644 --- a/security/keycloak-oidc-client-extended/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/extended/restclient/ping/LookupAuthorizationPingResource.java +++ b/security/keycloak-oidc-client-extended/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/extended/restclient/ping/LookupAuthorizationPingResource.java @@ -1,14 +1,14 @@ package io.quarkus.ts.security.keycloak.oidcclient.extended.restclient.ping; -import javax.inject.Inject; -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.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +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.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.eclipse.microprofile.rest.client.inject.RestClient; diff --git a/security/keycloak-oidc-client-extended/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/extended/restclient/ping/PingResource.java b/security/keycloak-oidc-client-extended/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/extended/restclient/ping/PingResource.java index 7a3a75c083..18f950cf7c 100644 --- a/security/keycloak-oidc-client-extended/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/extended/restclient/ping/PingResource.java +++ b/security/keycloak-oidc-client-extended/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/extended/restclient/ping/PingResource.java @@ -1,15 +1,15 @@ package io.quarkus.ts.security.keycloak.oidcclient.extended.restclient.ping; -import javax.inject.Inject; -import javax.ws.rs.Consumes; -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.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +import jakarta.ws.rs.Consumes; +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.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.eclipse.microprofile.openapi.annotations.OpenAPIDefinition; import org.eclipse.microprofile.openapi.annotations.info.Contact; diff --git a/security/keycloak-oidc-client-extended/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/extended/restclient/ping/ReactivePingResource.java b/security/keycloak-oidc-client-extended/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/extended/restclient/ping/ReactivePingResource.java index c0ad69d5d5..59818df0a9 100644 --- a/security/keycloak-oidc-client-extended/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/extended/restclient/ping/ReactivePingResource.java +++ b/security/keycloak-oidc-client-extended/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/extended/restclient/ping/ReactivePingResource.java @@ -1,14 +1,14 @@ package io.quarkus.ts.security.keycloak.oidcclient.extended.restclient.ping; -import javax.inject.Inject; -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.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +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.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.eclipse.microprofile.rest.client.inject.RestClient; diff --git a/security/keycloak-oidc-client-extended/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/extended/restclient/ping/TokenPropagationPingResource.java b/security/keycloak-oidc-client-extended/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/extended/restclient/ping/TokenPropagationPingResource.java index 513e92c191..298dd745f1 100644 --- a/security/keycloak-oidc-client-extended/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/extended/restclient/ping/TokenPropagationPingResource.java +++ b/security/keycloak-oidc-client-extended/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/extended/restclient/ping/TokenPropagationPingResource.java @@ -1,14 +1,14 @@ package io.quarkus.ts.security.keycloak.oidcclient.extended.restclient.ping; -import javax.inject.Inject; -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.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +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.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.eclipse.microprofile.rest.client.inject.RestClient; diff --git a/security/keycloak-oidc-client-extended/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/extended/restclient/ping/clients/AutoAcquireTokenPongClient.java b/security/keycloak-oidc-client-extended/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/extended/restclient/ping/clients/AutoAcquireTokenPongClient.java index 3f0f1e8c21..b36f84a845 100644 --- a/security/keycloak-oidc-client-extended/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/extended/restclient/ping/clients/AutoAcquireTokenPongClient.java +++ b/security/keycloak-oidc-client-extended/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/extended/restclient/ping/clients/AutoAcquireTokenPongClient.java @@ -1,14 +1,14 @@ package io.quarkus.ts.security.keycloak.oidcclient.extended.restclient.ping.clients; -import javax.ws.rs.Consumes; -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.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +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.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; diff --git a/security/keycloak-oidc-client-extended/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/extended/restclient/ping/clients/LookupAuthorizationPongClient.java b/security/keycloak-oidc-client-extended/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/extended/restclient/ping/clients/LookupAuthorizationPongClient.java index fc12907e11..c7df77217d 100644 --- a/security/keycloak-oidc-client-extended/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/extended/restclient/ping/clients/LookupAuthorizationPongClient.java +++ b/security/keycloak-oidc-client-extended/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/extended/restclient/ping/clients/LookupAuthorizationPongClient.java @@ -2,15 +2,15 @@ import java.util.Collections; -import javax.ws.rs.Consumes; -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.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +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.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.apache.http.impl.client.HttpClients; import org.eclipse.microprofile.config.Config; diff --git a/security/keycloak-oidc-client-extended/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/extended/restclient/ping/clients/PongClient.java b/security/keycloak-oidc-client-extended/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/extended/restclient/ping/clients/PongClient.java index 4fdfc1ba2e..fda142dacd 100644 --- a/security/keycloak-oidc-client-extended/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/extended/restclient/ping/clients/PongClient.java +++ b/security/keycloak-oidc-client-extended/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/extended/restclient/ping/clients/PongClient.java @@ -1,14 +1,14 @@ package io.quarkus.ts.security.keycloak.oidcclient.extended.restclient.ping.clients; -import javax.ws.rs.Consumes; -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.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +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.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.eclipse.microprofile.rest.client.annotation.RegisterClientHeaders; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; diff --git a/security/keycloak-oidc-client-extended/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/extended/restclient/ping/clients/ReactivePongClient.java b/security/keycloak-oidc-client-extended/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/extended/restclient/ping/clients/ReactivePongClient.java index 948621d180..1b62e59767 100644 --- a/security/keycloak-oidc-client-extended/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/extended/restclient/ping/clients/ReactivePongClient.java +++ b/security/keycloak-oidc-client-extended/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/extended/restclient/ping/clients/ReactivePongClient.java @@ -1,14 +1,14 @@ package io.quarkus.ts.security.keycloak.oidcclient.extended.restclient.ping.clients; -import javax.ws.rs.Consumes; -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.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +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.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.eclipse.microprofile.rest.client.annotation.RegisterClientHeaders; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; diff --git a/security/keycloak-oidc-client-extended/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/extended/restclient/ping/clients/TokenPropagationPongClient.java b/security/keycloak-oidc-client-extended/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/extended/restclient/ping/clients/TokenPropagationPongClient.java index c20efde07b..37e6576b7e 100644 --- a/security/keycloak-oidc-client-extended/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/extended/restclient/ping/clients/TokenPropagationPongClient.java +++ b/security/keycloak-oidc-client-extended/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/extended/restclient/ping/clients/TokenPropagationPongClient.java @@ -1,14 +1,14 @@ package io.quarkus.ts.security.keycloak.oidcclient.extended.restclient.ping.clients; -import javax.ws.rs.Consumes; -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.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +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.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; diff --git a/security/keycloak-oidc-client-extended/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/extended/restclient/ping/exceptions/CustomExceptionMapper.java b/security/keycloak-oidc-client-extended/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/extended/restclient/ping/exceptions/CustomExceptionMapper.java index 539ac837a2..d8893f3459 100644 --- a/security/keycloak-oidc-client-extended/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/extended/restclient/ping/exceptions/CustomExceptionMapper.java +++ b/security/keycloak-oidc-client-extended/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/extended/restclient/ping/exceptions/CustomExceptionMapper.java @@ -1,12 +1,12 @@ package io.quarkus.ts.security.keycloak.oidcclient.extended.restclient.ping.exceptions; -import static javax.ws.rs.core.Response.status; +import static jakarta.ws.rs.core.Response.status; -import javax.ws.rs.NotFoundException; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.Status; -import javax.ws.rs.ext.ExceptionMapper; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.Status; +import jakarta.ws.rs.ext.ExceptionMapper; +import jakarta.ws.rs.ext.Provider; import org.jboss.logging.Logger; diff --git a/security/keycloak-oidc-client-extended/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/extended/restclient/pong/PongResource.java b/security/keycloak-oidc-client-extended/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/extended/restclient/pong/PongResource.java index c7933b6b66..098690e3a1 100644 --- a/security/keycloak-oidc-client-extended/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/extended/restclient/pong/PongResource.java +++ b/security/keycloak-oidc-client-extended/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/extended/restclient/pong/PongResource.java @@ -1,14 +1,14 @@ package io.quarkus.ts.security.keycloak.oidcclient.extended.restclient.pong; -import javax.ws.rs.Consumes; -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.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +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.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.eclipse.microprofile.openapi.annotations.tags.Tag; diff --git a/security/keycloak-oidc-client-extended/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/extended/restclient/pong/ReactivePongResource.java b/security/keycloak-oidc-client-extended/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/extended/restclient/pong/ReactivePongResource.java index 7287d11bb9..a9f915ba80 100644 --- a/security/keycloak-oidc-client-extended/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/extended/restclient/pong/ReactivePongResource.java +++ b/security/keycloak-oidc-client-extended/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/extended/restclient/pong/ReactivePongResource.java @@ -1,14 +1,14 @@ package io.quarkus.ts.security.keycloak.oidcclient.extended.restclient.pong; -import javax.ws.rs.Consumes; -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.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +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.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import io.quarkus.ts.security.keycloak.oidcclient.extended.restclient.model.Score; import io.smallrye.mutiny.Uni; diff --git a/security/keycloak-oidc-client-extended/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/extended/restclient/secured/SecuredResource.java b/security/keycloak-oidc-client-extended/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/extended/restclient/secured/SecuredResource.java index 687c7d2831..1d87525a48 100644 --- a/security/keycloak-oidc-client-extended/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/extended/restclient/secured/SecuredResource.java +++ b/security/keycloak-oidc-client-extended/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/extended/restclient/secured/SecuredResource.java @@ -2,14 +2,14 @@ import java.util.Set; -import javax.annotation.security.DenyAll; -import javax.annotation.security.RolesAllowed; -import javax.enterprise.context.RequestScoped; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.SecurityContext; +import jakarta.annotation.security.DenyAll; +import jakarta.annotation.security.RolesAllowed; +import jakarta.enterprise.context.RequestScoped; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.SecurityContext; import org.eclipse.microprofile.jwt.Claim; import org.eclipse.microprofile.jwt.Claims; diff --git a/security/keycloak-oidc-client-extended/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/extended/restclient/tokens/LogoutFlow.java b/security/keycloak-oidc-client-extended/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/extended/restclient/tokens/LogoutFlow.java index 680f24b4a1..4d192fd2ec 100644 --- a/security/keycloak-oidc-client-extended/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/extended/restclient/tokens/LogoutFlow.java +++ b/security/keycloak-oidc-client-extended/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/extended/restclient/tokens/LogoutFlow.java @@ -1,9 +1,9 @@ package io.quarkus.ts.security.keycloak.oidcclient.extended.restclient.tokens; -import javax.annotation.security.PermitAll; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.annotation.security.PermitAll; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import io.quarkus.oidc.runtime.DefaultTokenIntrospectionUserInfoCache; import io.quarkus.security.Authenticated; diff --git a/security/keycloak-oidc-client-extended/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/extended/restclient/tokens/LogoutTenantResolver.java b/security/keycloak-oidc-client-extended/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/extended/restclient/tokens/LogoutTenantResolver.java index 12f8619c0a..f8acecdb6f 100644 --- a/security/keycloak-oidc-client-extended/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/extended/restclient/tokens/LogoutTenantResolver.java +++ b/security/keycloak-oidc-client-extended/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/extended/restclient/tokens/LogoutTenantResolver.java @@ -1,6 +1,6 @@ package io.quarkus.ts.security.keycloak.oidcclient.extended.restclient.tokens; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import io.quarkus.oidc.TenantResolver; import io.vertx.ext.web.RoutingContext; diff --git a/security/keycloak-oidc-client-extended/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/extended/restclient/tokens/TokenProviderResource.java b/security/keycloak-oidc-client-extended/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/extended/restclient/tokens/TokenProviderResource.java index 08b3b854f0..b62ee53b5b 100644 --- a/security/keycloak-oidc-client-extended/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/extended/restclient/tokens/TokenProviderResource.java +++ b/security/keycloak-oidc-client-extended/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/extended/restclient/tokens/TokenProviderResource.java @@ -1,8 +1,8 @@ package io.quarkus.ts.security.keycloak.oidcclient.extended.restclient.tokens; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import io.quarkus.oidc.client.OidcClient; import io.quarkus.oidc.client.OidcClients; diff --git a/security/keycloak-oidc-client-extended/src/main/resources/application.properties b/security/keycloak-oidc-client-extended/src/main/resources/application.properties index 551984835b..386a2b6f98 100644 --- a/security/keycloak-oidc-client-extended/src/main/resources/application.properties +++ b/security/keycloak-oidc-client-extended/src/main/resources/application.properties @@ -25,13 +25,13 @@ quarkus.oidc-client.test-user.grant-options.password.password=test-user # RestClient io.quarkus.ts.security.keycloak.oidcclient.extended.restclient.ping.clients.PongClient/mp-rest/url=http://localhost:${quarkus.http.port} -io.quarkus.ts.security.keycloak.oidcclient.extended.restclient.ping.clients.PongClient/mp-rest/scope=javax.inject.Singleton +io.quarkus.ts.security.keycloak.oidcclient.extended.restclient.ping.clients.PongClient/mp-rest/scope=jakarta.inject.Singleton io.quarkus.ts.security.keycloak.oidcclient.extended.restclient.ping.clients.ReactivePongClient/mp-rest/url=http://localhost:${quarkus.http.port} -io.quarkus.ts.security.keycloak.oidcclient.extended.restclient.ping.clients.ReactivePongClient/mp-rest/scope=javax.inject.Singleton +io.quarkus.ts.security.keycloak.oidcclient.extended.restclient.ping.clients.ReactivePongClient/mp-rest/scope=jakarta.inject.Singleton io.quarkus.ts.security.keycloak.oidcclient.extended.restclient.ping.clients.LookupAuthorizationPongClient/mp-rest/url=http://localhost:${quarkus.http.port} -io.quarkus.ts.security.keycloak.oidcclient.extended.restclient.ping.clients.LookupAuthorizationPongClient/mp-rest/scope=javax.inject.Singleton +io.quarkus.ts.security.keycloak.oidcclient.extended.restclient.ping.clients.LookupAuthorizationPongClient/mp-rest/scope=jakarta.inject.Singleton io.quarkus.ts.security.keycloak.oidcclient.extended.restclient.ping.clients.AutoAcquireTokenPongClient/mp-rest/url=http://localhost:${quarkus.http.port} diff --git a/security/keycloak-oidc-client-reactive-basic/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/reactive/basic/AdminResource.java b/security/keycloak-oidc-client-reactive-basic/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/reactive/basic/AdminResource.java index 3f65016011..4357791093 100644 --- a/security/keycloak-oidc-client-reactive-basic/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/reactive/basic/AdminResource.java +++ b/security/keycloak-oidc-client-reactive-basic/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/reactive/basic/AdminResource.java @@ -1,11 +1,11 @@ package io.quarkus.ts.security.keycloak.oidcclient.reactive.basic; -import javax.annotation.security.RolesAllowed; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.annotation.security.RolesAllowed; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import io.quarkus.security.identity.SecurityIdentity; diff --git a/security/keycloak-oidc-client-reactive-basic/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/reactive/basic/SecuredResource.java b/security/keycloak-oidc-client-reactive-basic/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/reactive/basic/SecuredResource.java index 27a515ec52..e878f3e001 100644 --- a/security/keycloak-oidc-client-reactive-basic/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/reactive/basic/SecuredResource.java +++ b/security/keycloak-oidc-client-reactive-basic/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/reactive/basic/SecuredResource.java @@ -1,9 +1,9 @@ package io.quarkus.ts.security.keycloak.oidcclient.reactive.basic; -import javax.annotation.security.RolesAllowed; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.annotation.security.RolesAllowed; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import io.quarkus.security.identity.SecurityIdentity; diff --git a/security/keycloak-oidc-client-reactive-basic/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/reactive/basic/TokenProviderResource.java b/security/keycloak-oidc-client-reactive-basic/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/reactive/basic/TokenProviderResource.java index e366cdd8ad..1009ee15b3 100644 --- a/security/keycloak-oidc-client-reactive-basic/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/reactive/basic/TokenProviderResource.java +++ b/security/keycloak-oidc-client-reactive-basic/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/reactive/basic/TokenProviderResource.java @@ -1,8 +1,8 @@ package io.quarkus.ts.security.keycloak.oidcclient.reactive.basic; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import io.quarkus.oidc.client.OidcClient; import io.quarkus.oidc.client.OidcClients; diff --git a/security/keycloak-oidc-client-reactive-basic/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/reactive/basic/UserResource.java b/security/keycloak-oidc-client-reactive-basic/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/reactive/basic/UserResource.java index 0ec696faf7..5c8498482f 100644 --- a/security/keycloak-oidc-client-reactive-basic/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/reactive/basic/UserResource.java +++ b/security/keycloak-oidc-client-reactive-basic/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/reactive/basic/UserResource.java @@ -1,11 +1,11 @@ package io.quarkus.ts.security.keycloak.oidcclient.reactive.basic; -import javax.annotation.security.RolesAllowed; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.annotation.security.RolesAllowed; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.eclipse.microprofile.jwt.JsonWebToken; diff --git a/security/keycloak-oidc-client-reactive-basic/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/reactive/headers/RequestHeadersClient.java b/security/keycloak-oidc-client-reactive-basic/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/reactive/headers/RequestHeadersClient.java index 9d835e8ec8..6dfdb1d77f 100644 --- a/security/keycloak-oidc-client-reactive-basic/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/reactive/headers/RequestHeadersClient.java +++ b/security/keycloak-oidc-client-reactive-basic/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/reactive/headers/RequestHeadersClient.java @@ -2,10 +2,10 @@ import java.util.List; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.eclipse.microprofile.rest.client.annotation.RegisterProvider; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; diff --git a/security/keycloak-oidc-client-reactive-basic/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/reactive/headers/RequestHeadersClientResource.java b/security/keycloak-oidc-client-reactive-basic/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/reactive/headers/RequestHeadersClientResource.java index dc75032454..2b1c317365 100644 --- a/security/keycloak-oidc-client-reactive-basic/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/reactive/headers/RequestHeadersClientResource.java +++ b/security/keycloak-oidc-client-reactive-basic/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/reactive/headers/RequestHeadersClientResource.java @@ -2,11 +2,11 @@ import java.util.List; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.eclipse.microprofile.rest.client.inject.RestClient; diff --git a/security/keycloak-oidc-client-reactive-basic/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/reactive/headers/RequestHeadersResource.java b/security/keycloak-oidc-client-reactive-basic/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/reactive/headers/RequestHeadersResource.java index 683f62acd7..0cc0054fcb 100644 --- a/security/keycloak-oidc-client-reactive-basic/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/reactive/headers/RequestHeadersResource.java +++ b/security/keycloak-oidc-client-reactive-basic/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/reactive/headers/RequestHeadersResource.java @@ -2,11 +2,11 @@ import java.util.List; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; import io.smallrye.mutiny.Uni; diff --git a/security/keycloak-oidc-client-reactive-basic/src/main/resources/application.properties b/security/keycloak-oidc-client-reactive-basic/src/main/resources/application.properties index f7aaea8ce0..531a8c1f56 100644 --- a/security/keycloak-oidc-client-reactive-basic/src/main/resources/application.properties +++ b/security/keycloak-oidc-client-reactive-basic/src/main/resources/application.properties @@ -30,4 +30,4 @@ quarkus.oidc-client.jwt-secret.credentials.jwt.secret=AyM1SysPpbyDfgZld3umj1qzKO # RestClient quarkus.rest-client."io.quarkus.ts.security.keycloak.oidcclient.reactive.headers.RequestHeadersClient".url=http://localhost:${quarkus.http.port} -quarkus.rest-client."io.quarkus.ts.security.keycloak.oidcclient.reactive.headers.RequestHeadersClient".scope=javax.inject.Singleton +quarkus.rest-client."io.quarkus.ts.security.keycloak.oidcclient.reactive.headers.RequestHeadersClient".scope=jakarta.inject.Singleton diff --git a/security/keycloak-oidc-client-reactive-extended/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/reactive/extended/ping/AutoAcquireTokenPingResource.java b/security/keycloak-oidc-client-reactive-extended/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/reactive/extended/ping/AutoAcquireTokenPingResource.java index 6fcc951e4d..8f8f8a5979 100644 --- a/security/keycloak-oidc-client-reactive-extended/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/reactive/extended/ping/AutoAcquireTokenPingResource.java +++ b/security/keycloak-oidc-client-reactive-extended/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/reactive/extended/ping/AutoAcquireTokenPingResource.java @@ -1,14 +1,14 @@ package io.quarkus.ts.security.keycloak.oidcclient.reactive.extended.ping; -import javax.inject.Inject; -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.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +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.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.eclipse.microprofile.rest.client.inject.RestClient; diff --git a/security/keycloak-oidc-client-reactive-extended/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/reactive/extended/ping/LookupAuthorizationPingResource.java b/security/keycloak-oidc-client-reactive-extended/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/reactive/extended/ping/LookupAuthorizationPingResource.java index 43d75c87b1..e91783a257 100644 --- a/security/keycloak-oidc-client-reactive-extended/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/reactive/extended/ping/LookupAuthorizationPingResource.java +++ b/security/keycloak-oidc-client-reactive-extended/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/reactive/extended/ping/LookupAuthorizationPingResource.java @@ -1,14 +1,14 @@ package io.quarkus.ts.security.keycloak.oidcclient.reactive.extended.ping; -import javax.inject.Inject; -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.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +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.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.eclipse.microprofile.rest.client.inject.RestClient; diff --git a/security/keycloak-oidc-client-reactive-extended/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/reactive/extended/ping/PingResource.java b/security/keycloak-oidc-client-reactive-extended/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/reactive/extended/ping/PingResource.java index 305cfb14cd..a0742b5397 100644 --- a/security/keycloak-oidc-client-reactive-extended/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/reactive/extended/ping/PingResource.java +++ b/security/keycloak-oidc-client-reactive-extended/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/reactive/extended/ping/PingResource.java @@ -1,15 +1,15 @@ package io.quarkus.ts.security.keycloak.oidcclient.reactive.extended.ping; -import javax.inject.Inject; -import javax.ws.rs.Consumes; -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.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +import jakarta.ws.rs.Consumes; +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.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.eclipse.microprofile.openapi.annotations.OpenAPIDefinition; import org.eclipse.microprofile.openapi.annotations.info.Contact; diff --git a/security/keycloak-oidc-client-reactive-extended/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/reactive/extended/ping/ReactivePingResource.java b/security/keycloak-oidc-client-reactive-extended/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/reactive/extended/ping/ReactivePingResource.java index 24d6c3cede..ddd80d58d4 100644 --- a/security/keycloak-oidc-client-reactive-extended/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/reactive/extended/ping/ReactivePingResource.java +++ b/security/keycloak-oidc-client-reactive-extended/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/reactive/extended/ping/ReactivePingResource.java @@ -1,14 +1,14 @@ package io.quarkus.ts.security.keycloak.oidcclient.reactive.extended.ping; -import javax.inject.Inject; -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.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +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.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.eclipse.microprofile.rest.client.inject.RestClient; diff --git a/security/keycloak-oidc-client-reactive-extended/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/reactive/extended/ping/TokenPropagationPingResource.java b/security/keycloak-oidc-client-reactive-extended/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/reactive/extended/ping/TokenPropagationPingResource.java index fe93a29cb9..6dcf7b5abd 100644 --- a/security/keycloak-oidc-client-reactive-extended/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/reactive/extended/ping/TokenPropagationPingResource.java +++ b/security/keycloak-oidc-client-reactive-extended/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/reactive/extended/ping/TokenPropagationPingResource.java @@ -1,14 +1,14 @@ package io.quarkus.ts.security.keycloak.oidcclient.reactive.extended.ping; -import javax.inject.Inject; -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.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +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.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.eclipse.microprofile.rest.client.inject.RestClient; diff --git a/security/keycloak-oidc-client-reactive-extended/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/reactive/extended/ping/clients/AutoAcquireTokenPongClient.java b/security/keycloak-oidc-client-reactive-extended/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/reactive/extended/ping/clients/AutoAcquireTokenPongClient.java index 25efc331a4..548f481da7 100644 --- a/security/keycloak-oidc-client-reactive-extended/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/reactive/extended/ping/clients/AutoAcquireTokenPongClient.java +++ b/security/keycloak-oidc-client-reactive-extended/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/reactive/extended/ping/clients/AutoAcquireTokenPongClient.java @@ -1,14 +1,14 @@ package io.quarkus.ts.security.keycloak.oidcclient.reactive.extended.ping.clients; -import javax.ws.rs.Consumes; -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.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +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.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; diff --git a/security/keycloak-oidc-client-reactive-extended/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/reactive/extended/ping/clients/LookupAuthorizationPongClient.java b/security/keycloak-oidc-client-reactive-extended/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/reactive/extended/ping/clients/LookupAuthorizationPongClient.java index 5b44750675..d230bddf49 100644 --- a/security/keycloak-oidc-client-reactive-extended/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/reactive/extended/ping/clients/LookupAuthorizationPongClient.java +++ b/security/keycloak-oidc-client-reactive-extended/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/reactive/extended/ping/clients/LookupAuthorizationPongClient.java @@ -1,14 +1,14 @@ package io.quarkus.ts.security.keycloak.oidcclient.reactive.extended.ping.clients; -import javax.ws.rs.Consumes; -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.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +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.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.eclipse.microprofile.config.Config; import org.eclipse.microprofile.config.ConfigProvider; diff --git a/security/keycloak-oidc-client-reactive-extended/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/reactive/extended/ping/clients/PongClient.java b/security/keycloak-oidc-client-reactive-extended/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/reactive/extended/ping/clients/PongClient.java index 226e6db356..973886d0a5 100644 --- a/security/keycloak-oidc-client-reactive-extended/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/reactive/extended/ping/clients/PongClient.java +++ b/security/keycloak-oidc-client-reactive-extended/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/reactive/extended/ping/clients/PongClient.java @@ -1,14 +1,14 @@ package io.quarkus.ts.security.keycloak.oidcclient.reactive.extended.ping.clients; -import javax.ws.rs.Consumes; -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.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +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.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.eclipse.microprofile.rest.client.annotation.RegisterClientHeaders; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; diff --git a/security/keycloak-oidc-client-reactive-extended/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/reactive/extended/ping/clients/ReactivePongClient.java b/security/keycloak-oidc-client-reactive-extended/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/reactive/extended/ping/clients/ReactivePongClient.java index 39db01e9ce..f9d8675f59 100644 --- a/security/keycloak-oidc-client-reactive-extended/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/reactive/extended/ping/clients/ReactivePongClient.java +++ b/security/keycloak-oidc-client-reactive-extended/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/reactive/extended/ping/clients/ReactivePongClient.java @@ -1,14 +1,14 @@ package io.quarkus.ts.security.keycloak.oidcclient.reactive.extended.ping.clients; -import javax.ws.rs.Consumes; -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.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +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.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.eclipse.microprofile.rest.client.annotation.RegisterClientHeaders; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; diff --git a/security/keycloak-oidc-client-reactive-extended/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/reactive/extended/ping/clients/TokenPropagationPongClient.java b/security/keycloak-oidc-client-reactive-extended/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/reactive/extended/ping/clients/TokenPropagationPongClient.java index cb352b14ab..7856d0bd07 100644 --- a/security/keycloak-oidc-client-reactive-extended/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/reactive/extended/ping/clients/TokenPropagationPongClient.java +++ b/security/keycloak-oidc-client-reactive-extended/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/reactive/extended/ping/clients/TokenPropagationPongClient.java @@ -1,14 +1,14 @@ package io.quarkus.ts.security.keycloak.oidcclient.reactive.extended.ping.clients; -import javax.ws.rs.Consumes; -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.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +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.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.eclipse.microprofile.rest.client.annotation.RegisterProvider; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; diff --git a/security/keycloak-oidc-client-reactive-extended/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/reactive/extended/ping/exceptions/CustomExceptionMapper.java b/security/keycloak-oidc-client-reactive-extended/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/reactive/extended/ping/exceptions/CustomExceptionMapper.java index 4321595c8d..6b51d24278 100644 --- a/security/keycloak-oidc-client-reactive-extended/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/reactive/extended/ping/exceptions/CustomExceptionMapper.java +++ b/security/keycloak-oidc-client-reactive-extended/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/reactive/extended/ping/exceptions/CustomExceptionMapper.java @@ -1,12 +1,12 @@ package io.quarkus.ts.security.keycloak.oidcclient.reactive.extended.ping.exceptions; -import static javax.ws.rs.core.Response.status; +import static jakarta.ws.rs.core.Response.status; -import javax.ws.rs.NotFoundException; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.Status; -import javax.ws.rs.ext.ExceptionMapper; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.Status; +import jakarta.ws.rs.ext.ExceptionMapper; +import jakarta.ws.rs.ext.Provider; import org.jboss.logging.Logger; diff --git a/security/keycloak-oidc-client-reactive-extended/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/reactive/extended/pong/PongResource.java b/security/keycloak-oidc-client-reactive-extended/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/reactive/extended/pong/PongResource.java index afd55b8de7..7f06bc6a0d 100644 --- a/security/keycloak-oidc-client-reactive-extended/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/reactive/extended/pong/PongResource.java +++ b/security/keycloak-oidc-client-reactive-extended/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/reactive/extended/pong/PongResource.java @@ -1,14 +1,14 @@ package io.quarkus.ts.security.keycloak.oidcclient.reactive.extended.pong; -import javax.ws.rs.Consumes; -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.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +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.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.eclipse.microprofile.openapi.annotations.tags.Tag; diff --git a/security/keycloak-oidc-client-reactive-extended/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/reactive/extended/pong/ReactivePongResource.java b/security/keycloak-oidc-client-reactive-extended/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/reactive/extended/pong/ReactivePongResource.java index d25b580bf5..9f45d1f161 100644 --- a/security/keycloak-oidc-client-reactive-extended/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/reactive/extended/pong/ReactivePongResource.java +++ b/security/keycloak-oidc-client-reactive-extended/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/reactive/extended/pong/ReactivePongResource.java @@ -1,14 +1,14 @@ package io.quarkus.ts.security.keycloak.oidcclient.reactive.extended.pong; -import javax.ws.rs.Consumes; -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.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +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.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import io.quarkus.ts.security.keycloak.oidcclient.reactive.extended.model.Score; import io.smallrye.mutiny.Uni; diff --git a/security/keycloak-oidc-client-reactive-extended/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/reactive/extended/secured/SecuredResource.java b/security/keycloak-oidc-client-reactive-extended/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/reactive/extended/secured/SecuredResource.java index 3b645acc07..a4a120f44d 100644 --- a/security/keycloak-oidc-client-reactive-extended/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/reactive/extended/secured/SecuredResource.java +++ b/security/keycloak-oidc-client-reactive-extended/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/reactive/extended/secured/SecuredResource.java @@ -2,14 +2,14 @@ import java.util.Set; -import javax.annotation.security.DenyAll; -import javax.annotation.security.RolesAllowed; -import javax.enterprise.context.RequestScoped; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.SecurityContext; +import jakarta.annotation.security.DenyAll; +import jakarta.annotation.security.RolesAllowed; +import jakarta.enterprise.context.RequestScoped; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.SecurityContext; import org.eclipse.microprofile.jwt.Claim; import org.eclipse.microprofile.jwt.Claims; diff --git a/security/keycloak-oidc-client-reactive-extended/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/reactive/extended/tokens/LogoutFlow.java b/security/keycloak-oidc-client-reactive-extended/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/reactive/extended/tokens/LogoutFlow.java index a33dbc9acf..fc2da2580d 100644 --- a/security/keycloak-oidc-client-reactive-extended/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/reactive/extended/tokens/LogoutFlow.java +++ b/security/keycloak-oidc-client-reactive-extended/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/reactive/extended/tokens/LogoutFlow.java @@ -1,9 +1,9 @@ package io.quarkus.ts.security.keycloak.oidcclient.reactive.extended.tokens; -import javax.annotation.security.PermitAll; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.annotation.security.PermitAll; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import io.quarkus.oidc.runtime.DefaultTokenIntrospectionUserInfoCache; import io.quarkus.security.Authenticated; diff --git a/security/keycloak-oidc-client-reactive-extended/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/reactive/extended/tokens/TokenProviderResource.java b/security/keycloak-oidc-client-reactive-extended/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/reactive/extended/tokens/TokenProviderResource.java index 08e6b9623a..6cff332a0c 100644 --- a/security/keycloak-oidc-client-reactive-extended/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/reactive/extended/tokens/TokenProviderResource.java +++ b/security/keycloak-oidc-client-reactive-extended/src/main/java/io/quarkus/ts/security/keycloak/oidcclient/reactive/extended/tokens/TokenProviderResource.java @@ -1,8 +1,8 @@ package io.quarkus.ts.security.keycloak.oidcclient.reactive.extended.tokens; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import io.quarkus.oidc.client.OidcClient; import io.quarkus.oidc.client.OidcClients; diff --git a/security/keycloak-oidc-client-reactive-extended/src/main/resources/application.properties b/security/keycloak-oidc-client-reactive-extended/src/main/resources/application.properties index e105643666..65934de3dc 100644 --- a/security/keycloak-oidc-client-reactive-extended/src/main/resources/application.properties +++ b/security/keycloak-oidc-client-reactive-extended/src/main/resources/application.properties @@ -25,13 +25,13 @@ quarkus.oidc-client.test-user.grant-options.password.password=test-user # RestClient io.quarkus.ts.security.keycloak.oidcclient.reactive.extended.ping.clients.PongClient/mp-rest/url=http://localhost:${quarkus.http.port} -io.quarkus.ts.security.keycloak.oidcclient.reactive.extended.ping.clients.PongClient/mp-rest/scope=javax.inject.Singleton +io.quarkus.ts.security.keycloak.oidcclient.reactive.extended.ping.clients.PongClient/mp-rest/scope=jakarta.inject.Singleton io.quarkus.ts.security.keycloak.oidcclient.reactive.extended.ping.clients.ReactivePongClient/mp-rest/url=http://localhost:${quarkus.http.port} -io.quarkus.ts.security.keycloak.oidcclient.reactive.extended.ping.clients.ReactivePongClient/mp-rest/scope=javax.inject.Singleton +io.quarkus.ts.security.keycloak.oidcclient.reactive.extended.ping.clients.ReactivePongClient/mp-rest/scope=jakarta.inject.Singleton io.quarkus.ts.security.keycloak.oidcclient.reactive.extended.ping.clients.LookupAuthorizationPongClient/mp-rest/url=http://localhost:${quarkus.http.port} -io.quarkus.ts.security.keycloak.oidcclient.reactive.extended.ping.clients.LookupAuthorizationPongClient/mp-rest/scope=javax.inject.Singleton +io.quarkus.ts.security.keycloak.oidcclient.reactive.extended.ping.clients.LookupAuthorizationPongClient/mp-rest/scope=jakarta.inject.Singleton io.quarkus.ts.security.keycloak.oidcclient.reactive.extended.ping.clients.AutoAcquireTokenPongClient/mp-rest/url=http://localhost:${quarkus.http.port} diff --git a/security/keycloak-webapp/src/main/java/io/quarkus/ts/security/keycloak/webapp/AdminResource.java b/security/keycloak-webapp/src/main/java/io/quarkus/ts/security/keycloak/webapp/AdminResource.java index 5a6fe6d101..a89b35758a 100644 --- a/security/keycloak-webapp/src/main/java/io/quarkus/ts/security/keycloak/webapp/AdminResource.java +++ b/security/keycloak-webapp/src/main/java/io/quarkus/ts/security/keycloak/webapp/AdminResource.java @@ -1,11 +1,11 @@ package io.quarkus.ts.security.keycloak.webapp; -import javax.annotation.security.RolesAllowed; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.annotation.security.RolesAllowed; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.eclipse.microprofile.jwt.JsonWebToken; diff --git a/security/keycloak-webapp/src/main/java/io/quarkus/ts/security/keycloak/webapp/UserResource.java b/security/keycloak-webapp/src/main/java/io/quarkus/ts/security/keycloak/webapp/UserResource.java index f9e463fccd..c8782ef21a 100644 --- a/security/keycloak-webapp/src/main/java/io/quarkus/ts/security/keycloak/webapp/UserResource.java +++ b/security/keycloak-webapp/src/main/java/io/quarkus/ts/security/keycloak/webapp/UserResource.java @@ -1,11 +1,11 @@ package io.quarkus.ts.security.keycloak.webapp; -import javax.annotation.security.RolesAllowed; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.annotation.security.RolesAllowed; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.eclipse.microprofile.jwt.JsonWebToken; diff --git a/security/keycloak/src/main/java/io/quarkus/ts/security/keycloak/AdminResource.java b/security/keycloak/src/main/java/io/quarkus/ts/security/keycloak/AdminResource.java index 2da78ec542..90be4503a6 100644 --- a/security/keycloak/src/main/java/io/quarkus/ts/security/keycloak/AdminResource.java +++ b/security/keycloak/src/main/java/io/quarkus/ts/security/keycloak/AdminResource.java @@ -1,11 +1,11 @@ package io.quarkus.ts.security.keycloak; -import javax.annotation.security.RolesAllowed; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.annotation.security.RolesAllowed; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.eclipse.microprofile.jwt.JsonWebToken; diff --git a/security/keycloak/src/main/java/io/quarkus/ts/security/keycloak/UserResource.java b/security/keycloak/src/main/java/io/quarkus/ts/security/keycloak/UserResource.java index 5d96220a61..4baf83883b 100644 --- a/security/keycloak/src/main/java/io/quarkus/ts/security/keycloak/UserResource.java +++ b/security/keycloak/src/main/java/io/quarkus/ts/security/keycloak/UserResource.java @@ -1,11 +1,11 @@ package io.quarkus.ts.security.keycloak; -import javax.annotation.security.RolesAllowed; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.annotation.security.RolesAllowed; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.eclipse.microprofile.jwt.JsonWebToken; diff --git a/security/oidc-client-mutual-tls/src/main/java/io/quarkus/ts/security/oidcclient/mtls/PingResource.java b/security/oidc-client-mutual-tls/src/main/java/io/quarkus/ts/security/oidcclient/mtls/PingResource.java index 7244a04a04..5512127101 100644 --- a/security/oidc-client-mutual-tls/src/main/java/io/quarkus/ts/security/oidcclient/mtls/PingResource.java +++ b/security/oidc-client-mutual-tls/src/main/java/io/quarkus/ts/security/oidcclient/mtls/PingResource.java @@ -1,9 +1,9 @@ package io.quarkus.ts.security.oidcclient.mtls; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.jboss.resteasy.reactive.RestResponse; diff --git a/security/oidc-client-mutual-tls/src/test/java/io/quarkus/ts/security/oidcclient/mtls/KeycloakMtlsAuthN.java b/security/oidc-client-mutual-tls/src/test/java/io/quarkus/ts/security/oidcclient/mtls/KeycloakMtlsAuthN.java index 3a675fe70f..6a1d33dd57 100644 --- a/security/oidc-client-mutual-tls/src/test/java/io/quarkus/ts/security/oidcclient/mtls/KeycloakMtlsAuthN.java +++ b/security/oidc-client-mutual-tls/src/test/java/io/quarkus/ts/security/oidcclient/mtls/KeycloakMtlsAuthN.java @@ -4,12 +4,12 @@ import static org.hamcrest.Matchers.equalTo; import static org.junit.jupiter.api.Assertions.assertThrows; -import javax.net.ssl.SSLHandshakeException; - import org.apache.http.HttpStatus; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.function.Executable; +import javax.net.ssl.SSLHandshakeException; + public abstract class KeycloakMtlsAuthN extends BaseOidcMtlsIT { @Test diff --git a/security/vertx-jwt/src/main/java/io/quarkus/ts/security/vertx/Application.java b/security/vertx-jwt/src/main/java/io/quarkus/ts/security/vertx/Application.java index 23aed9ffe2..92bad94a6e 100644 --- a/security/vertx-jwt/src/main/java/io/quarkus/ts/security/vertx/Application.java +++ b/security/vertx-jwt/src/main/java/io/quarkus/ts/security/vertx/Application.java @@ -6,9 +6,9 @@ import java.time.Duration; import java.util.UUID; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.event.Observes; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.event.Observes; +import jakarta.inject.Inject; import org.eclipse.microprofile.config.inject.ConfigProperty; import org.jboss.logging.Logger; diff --git a/security/vertx-jwt/src/main/java/io/quarkus/ts/security/vertx/auth/AuthN.java b/security/vertx-jwt/src/main/java/io/quarkus/ts/security/vertx/auth/AuthN.java index cba542aee9..6fe9155908 100644 --- a/security/vertx-jwt/src/main/java/io/quarkus/ts/security/vertx/auth/AuthN.java +++ b/security/vertx-jwt/src/main/java/io/quarkus/ts/security/vertx/auth/AuthN.java @@ -2,8 +2,8 @@ import java.util.Arrays; -import javax.enterprise.inject.Produces; -import javax.inject.Inject; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Inject; import io.quarkus.ts.security.vertx.config.AuthNConfig; import io.vertx.core.json.JsonObject; diff --git a/security/vertx-jwt/src/main/java/io/quarkus/ts/security/vertx/auth/AuthZ.java b/security/vertx-jwt/src/main/java/io/quarkus/ts/security/vertx/auth/AuthZ.java index 557ae55d62..ad4e051cc5 100644 --- a/security/vertx-jwt/src/main/java/io/quarkus/ts/security/vertx/auth/AuthZ.java +++ b/security/vertx-jwt/src/main/java/io/quarkus/ts/security/vertx/auth/AuthZ.java @@ -1,6 +1,6 @@ package io.quarkus.ts.security.vertx.auth; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.jboss.logging.Logger; diff --git a/security/vertx-jwt/src/main/java/io/quarkus/ts/security/vertx/exceptions/FailureHandler.java b/security/vertx-jwt/src/main/java/io/quarkus/ts/security/vertx/exceptions/FailureHandler.java index b0545b1d9d..d8da06f601 100644 --- a/security/vertx-jwt/src/main/java/io/quarkus/ts/security/vertx/exceptions/FailureHandler.java +++ b/security/vertx-jwt/src/main/java/io/quarkus/ts/security/vertx/exceptions/FailureHandler.java @@ -1,6 +1,6 @@ package io.quarkus.ts.security.vertx.exceptions; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import io.netty.handler.codec.http.HttpResponseStatus; import io.quarkus.security.UnauthorizedException; diff --git a/security/vertx-jwt/src/main/java/io/quarkus/ts/security/vertx/handlers/BladeRunnerHandler.java b/security/vertx-jwt/src/main/java/io/quarkus/ts/security/vertx/handlers/BladeRunnerHandler.java index d354e23ef4..eba7683768 100644 --- a/security/vertx-jwt/src/main/java/io/quarkus/ts/security/vertx/handlers/BladeRunnerHandler.java +++ b/security/vertx-jwt/src/main/java/io/quarkus/ts/security/vertx/handlers/BladeRunnerHandler.java @@ -2,8 +2,8 @@ import static io.netty.handler.codec.http.HttpResponseStatus.NO_CONTENT; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import io.quarkus.ts.security.vertx.model.BladeRunner; import io.quarkus.ts.security.vertx.services.BladeRunnerService; diff --git a/security/vertx-jwt/src/main/java/io/quarkus/ts/security/vertx/handlers/JWTHandler.java b/security/vertx-jwt/src/main/java/io/quarkus/ts/security/vertx/handlers/JWTHandler.java index c53b737cd7..13037400fb 100644 --- a/security/vertx-jwt/src/main/java/io/quarkus/ts/security/vertx/handlers/JWTHandler.java +++ b/security/vertx-jwt/src/main/java/io/quarkus/ts/security/vertx/handlers/JWTHandler.java @@ -3,8 +3,8 @@ import java.time.ZonedDateTime; import java.util.Arrays; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import io.vertx.core.json.JsonObject; import io.vertx.ext.auth.jwt.JWTAuth; diff --git a/security/vertx-jwt/src/main/java/io/quarkus/ts/security/vertx/handlers/ReplicantHandler.java b/security/vertx-jwt/src/main/java/io/quarkus/ts/security/vertx/handlers/ReplicantHandler.java index 426f7faa37..ec3ba98709 100644 --- a/security/vertx-jwt/src/main/java/io/quarkus/ts/security/vertx/handlers/ReplicantHandler.java +++ b/security/vertx-jwt/src/main/java/io/quarkus/ts/security/vertx/handlers/ReplicantHandler.java @@ -2,8 +2,8 @@ import static io.netty.handler.codec.http.HttpResponseStatus.NO_CONTENT; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import io.quarkus.ts.security.vertx.model.Replicant; import io.quarkus.ts.security.vertx.services.ReplicantService; diff --git a/security/vertx-jwt/src/main/java/io/quarkus/ts/security/vertx/services/AbstractRedisDao.java b/security/vertx-jwt/src/main/java/io/quarkus/ts/security/vertx/services/AbstractRedisDao.java index fc742b7db1..911c36304e 100644 --- a/security/vertx-jwt/src/main/java/io/quarkus/ts/security/vertx/services/AbstractRedisDao.java +++ b/security/vertx-jwt/src/main/java/io/quarkus/ts/security/vertx/services/AbstractRedisDao.java @@ -8,7 +8,7 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.inject.Inject; +import jakarta.inject.Inject; import io.quarkus.redis.client.reactive.ReactiveRedisClient; import io.quarkus.ts.security.vertx.exceptions.NotFoundException; diff --git a/security/vertx-jwt/src/main/java/io/quarkus/ts/security/vertx/services/BladeRunnerService.java b/security/vertx-jwt/src/main/java/io/quarkus/ts/security/vertx/services/BladeRunnerService.java index 248825ae1a..bed0593725 100644 --- a/security/vertx-jwt/src/main/java/io/quarkus/ts/security/vertx/services/BladeRunnerService.java +++ b/security/vertx-jwt/src/main/java/io/quarkus/ts/security/vertx/services/BladeRunnerService.java @@ -1,6 +1,6 @@ package io.quarkus.ts.security.vertx.services; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import io.quarkus.ts.security.vertx.model.BladeRunner; diff --git a/security/vertx-jwt/src/main/java/io/quarkus/ts/security/vertx/services/ReplicantService.java b/security/vertx-jwt/src/main/java/io/quarkus/ts/security/vertx/services/ReplicantService.java index 3d58c13f5f..e5746f763d 100644 --- a/security/vertx-jwt/src/main/java/io/quarkus/ts/security/vertx/services/ReplicantService.java +++ b/security/vertx-jwt/src/main/java/io/quarkus/ts/security/vertx/services/ReplicantService.java @@ -1,6 +1,6 @@ package io.quarkus.ts.security.vertx.services; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import io.quarkus.ts.security.vertx.model.Replicant; diff --git a/service-binding/postgresql-crunchy-classic/src/main/java/io/quarkus/ts/sb/postgresql/Todo.java b/service-binding/postgresql-crunchy-classic/src/main/java/io/quarkus/ts/sb/postgresql/Todo.java index 53cc686d17..cef23174f8 100644 --- a/service-binding/postgresql-crunchy-classic/src/main/java/io/quarkus/ts/sb/postgresql/Todo.java +++ b/service-binding/postgresql-crunchy-classic/src/main/java/io/quarkus/ts/sb/postgresql/Todo.java @@ -1,7 +1,7 @@ package io.quarkus.ts.sb.postgresql; -import javax.persistence.Column; -import javax.persistence.Entity; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; import io.quarkus.hibernate.orm.panache.PanacheEntity; diff --git a/service-binding/postgresql-crunchy-classic/src/main/java/io/quarkus/ts/sb/postgresql/TodoResource.java b/service-binding/postgresql-crunchy-classic/src/main/java/io/quarkus/ts/sb/postgresql/TodoResource.java index 512e4c6098..35fa3cadb2 100644 --- a/service-binding/postgresql-crunchy-classic/src/main/java/io/quarkus/ts/sb/postgresql/TodoResource.java +++ b/service-binding/postgresql-crunchy-classic/src/main/java/io/quarkus/ts/sb/postgresql/TodoResource.java @@ -2,16 +2,16 @@ import java.util.List; -import javax.transaction.Transactional; -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.PathParam; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.Status; +import jakarta.transaction.Transactional; +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.PathParam; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.Status; @Path("/todo") public class TodoResource { diff --git a/service-binding/postgresql-crunchy-classic/src/test/java/io/quarkus/ts/sb/postgresql/OpenShiftPostgreSqlSbIT.java b/service-binding/postgresql-crunchy-classic/src/test/java/io/quarkus/ts/sb/postgresql/OpenShiftPostgreSqlSbIT.java index 822617a9e7..7b45a81c4e 100644 --- a/service-binding/postgresql-crunchy-classic/src/test/java/io/quarkus/ts/sb/postgresql/OpenShiftPostgreSqlSbIT.java +++ b/service-binding/postgresql-crunchy-classic/src/test/java/io/quarkus/ts/sb/postgresql/OpenShiftPostgreSqlSbIT.java @@ -5,7 +5,7 @@ import java.util.List; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.http.HttpStatus; import org.junit.jupiter.api.AfterAll; diff --git a/service-binding/postgresql-crunchy-reactive/src/main/java/io/quarkus/ts/sb/reactive/Todo.java b/service-binding/postgresql-crunchy-reactive/src/main/java/io/quarkus/ts/sb/reactive/Todo.java index 1a55f1a2ba..18bec82fdb 100644 --- a/service-binding/postgresql-crunchy-reactive/src/main/java/io/quarkus/ts/sb/reactive/Todo.java +++ b/service-binding/postgresql-crunchy-reactive/src/main/java/io/quarkus/ts/sb/reactive/Todo.java @@ -1,7 +1,7 @@ package io.quarkus.ts.sb.reactive; -import javax.persistence.Column; -import javax.persistence.Entity; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; import io.quarkus.hibernate.reactive.panache.PanacheEntity; diff --git a/service-binding/postgresql-crunchy-reactive/src/main/java/io/quarkus/ts/sb/reactive/TodoResource.java b/service-binding/postgresql-crunchy-reactive/src/main/java/io/quarkus/ts/sb/reactive/TodoResource.java index f55a8d601e..ddbb0f8f08 100644 --- a/service-binding/postgresql-crunchy-reactive/src/main/java/io/quarkus/ts/sb/reactive/TodoResource.java +++ b/service-binding/postgresql-crunchy-reactive/src/main/java/io/quarkus/ts/sb/reactive/TodoResource.java @@ -1,8 +1,8 @@ package io.quarkus.ts.sb.reactive; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; import io.smallrye.mutiny.Uni; diff --git a/service-binding/postgresql-crunchy-reactive/src/test/java/io/quarkus/ts/sb/reactive/OpenShiftPostgreSqlReactiveSbIT.java b/service-binding/postgresql-crunchy-reactive/src/test/java/io/quarkus/ts/sb/reactive/OpenShiftPostgreSqlReactiveSbIT.java index 8fd80ce449..b630fa7c09 100644 --- a/service-binding/postgresql-crunchy-reactive/src/test/java/io/quarkus/ts/sb/reactive/OpenShiftPostgreSqlReactiveSbIT.java +++ b/service-binding/postgresql-crunchy-reactive/src/test/java/io/quarkus/ts/sb/reactive/OpenShiftPostgreSqlReactiveSbIT.java @@ -5,7 +5,7 @@ import java.util.List; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.http.HttpStatus; import org.hamcrest.Matchers; diff --git a/service-discovery/stork-custom/src/main/java/io/quarkus/ts/stork/custom/MyBackendPongProxy.java b/service-discovery/stork-custom/src/main/java/io/quarkus/ts/stork/custom/MyBackendPongProxy.java index 8093cf9448..ba56a47aaa 100644 --- a/service-discovery/stork-custom/src/main/java/io/quarkus/ts/stork/custom/MyBackendPongProxy.java +++ b/service-discovery/stork-custom/src/main/java/io/quarkus/ts/stork/custom/MyBackendPongProxy.java @@ -1,9 +1,9 @@ package io.quarkus.ts.stork.custom; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; import org.jboss.resteasy.reactive.RestResponse; diff --git a/service-discovery/stork-custom/src/main/java/io/quarkus/ts/stork/custom/PingResource.java b/service-discovery/stork-custom/src/main/java/io/quarkus/ts/stork/custom/PingResource.java index ed8a01389f..9026377a4d 100644 --- a/service-discovery/stork-custom/src/main/java/io/quarkus/ts/stork/custom/PingResource.java +++ b/service-discovery/stork-custom/src/main/java/io/quarkus/ts/stork/custom/PingResource.java @@ -1,7 +1,7 @@ package io.quarkus.ts.stork.custom; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.MediaType; import org.eclipse.microprofile.rest.client.inject.RestClient; diff --git a/service-discovery/stork-custom/src/main/java/io/quarkus/ts/stork/custom/PongReplicaResource.java b/service-discovery/stork-custom/src/main/java/io/quarkus/ts/stork/custom/PongReplicaResource.java index 7d2222ffdd..2ed0997001 100644 --- a/service-discovery/stork-custom/src/main/java/io/quarkus/ts/stork/custom/PongReplicaResource.java +++ b/service-discovery/stork-custom/src/main/java/io/quarkus/ts/stork/custom/PongReplicaResource.java @@ -1,6 +1,6 @@ package io.quarkus.ts.stork.custom; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import io.quarkus.vertx.web.Route; import io.quarkus.vertx.web.RouteBase; diff --git a/service-discovery/stork-custom/src/main/java/io/quarkus/ts/stork/custom/PongResource.java b/service-discovery/stork-custom/src/main/java/io/quarkus/ts/stork/custom/PongResource.java index b65314ae16..d4b1ae6341 100644 --- a/service-discovery/stork-custom/src/main/java/io/quarkus/ts/stork/custom/PongResource.java +++ b/service-discovery/stork-custom/src/main/java/io/quarkus/ts/stork/custom/PongResource.java @@ -1,6 +1,6 @@ package io.quarkus.ts.stork.custom; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import io.quarkus.vertx.web.Route; import io.quarkus.vertx.web.RouteBase; diff --git a/service-discovery/stork/src/main/java/io/quarkus/ts/stork/MyBackendPongProxy.java b/service-discovery/stork/src/main/java/io/quarkus/ts/stork/MyBackendPongProxy.java index e222e65180..8d4f954930 100644 --- a/service-discovery/stork/src/main/java/io/quarkus/ts/stork/MyBackendPongProxy.java +++ b/service-discovery/stork/src/main/java/io/quarkus/ts/stork/MyBackendPongProxy.java @@ -1,9 +1,9 @@ package io.quarkus.ts.stork; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; import org.jboss.resteasy.reactive.RestResponse; diff --git a/service-discovery/stork/src/main/java/io/quarkus/ts/stork/MyBackendPungProxy.java b/service-discovery/stork/src/main/java/io/quarkus/ts/stork/MyBackendPungProxy.java index 83af3f2200..15e1735366 100644 --- a/service-discovery/stork/src/main/java/io/quarkus/ts/stork/MyBackendPungProxy.java +++ b/service-discovery/stork/src/main/java/io/quarkus/ts/stork/MyBackendPungProxy.java @@ -1,9 +1,9 @@ package io.quarkus.ts.stork; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; diff --git a/service-discovery/stork/src/main/java/io/quarkus/ts/stork/PingResource.java b/service-discovery/stork/src/main/java/io/quarkus/ts/stork/PingResource.java index 4c6c0e35bf..4ed955a3be 100644 --- a/service-discovery/stork/src/main/java/io/quarkus/ts/stork/PingResource.java +++ b/service-discovery/stork/src/main/java/io/quarkus/ts/stork/PingResource.java @@ -1,7 +1,7 @@ package io.quarkus.ts.stork; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.MediaType; import org.eclipse.microprofile.rest.client.inject.RestClient; diff --git a/service-discovery/stork/src/main/java/io/quarkus/ts/stork/PongReplicaResource.java b/service-discovery/stork/src/main/java/io/quarkus/ts/stork/PongReplicaResource.java index b6bb0d65c2..e14724ce18 100644 --- a/service-discovery/stork/src/main/java/io/quarkus/ts/stork/PongReplicaResource.java +++ b/service-discovery/stork/src/main/java/io/quarkus/ts/stork/PongReplicaResource.java @@ -2,8 +2,8 @@ import static io.quarkus.ts.stork.PongResource.PONG_SERVICE_NAME; -import javax.enterprise.event.Observes; -import javax.ws.rs.core.MediaType; +import jakarta.enterprise.event.Observes; +import jakarta.ws.rs.core.MediaType; import org.eclipse.microprofile.config.inject.ConfigProperty; diff --git a/service-discovery/stork/src/main/java/io/quarkus/ts/stork/PongResource.java b/service-discovery/stork/src/main/java/io/quarkus/ts/stork/PongResource.java index 30bacaa34e..c539c0a819 100644 --- a/service-discovery/stork/src/main/java/io/quarkus/ts/stork/PongResource.java +++ b/service-discovery/stork/src/main/java/io/quarkus/ts/stork/PongResource.java @@ -2,8 +2,8 @@ import java.util.UUID; -import javax.enterprise.event.Observes; -import javax.ws.rs.core.MediaType; +import jakarta.enterprise.event.Observes; +import jakarta.ws.rs.core.MediaType; import org.eclipse.microprofile.config.inject.ConfigProperty; diff --git a/service-discovery/stork/src/main/java/io/quarkus/ts/stork/PungResource.java b/service-discovery/stork/src/main/java/io/quarkus/ts/stork/PungResource.java index a12a050155..48f049f38f 100644 --- a/service-discovery/stork/src/main/java/io/quarkus/ts/stork/PungResource.java +++ b/service-discovery/stork/src/main/java/io/quarkus/ts/stork/PungResource.java @@ -1,7 +1,7 @@ package io.quarkus.ts.stork; -import javax.enterprise.event.Observes; -import javax.ws.rs.core.MediaType; +import jakarta.enterprise.event.Observes; +import jakarta.ws.rs.core.MediaType; import org.eclipse.microprofile.config.inject.ConfigProperty; diff --git a/service-discovery/stork/src/test/java/io/quarkus/ts/stork/OpenShiftStorkServiceDiscoveryIT.java b/service-discovery/stork/src/test/java/io/quarkus/ts/stork/OpenShiftStorkServiceDiscoveryIT.java index 7c99aeb01e..2f1829b32f 100644 --- a/service-discovery/stork/src/test/java/io/quarkus/ts/stork/OpenShiftStorkServiceDiscoveryIT.java +++ b/service-discovery/stork/src/test/java/io/quarkus/ts/stork/OpenShiftStorkServiceDiscoveryIT.java @@ -11,7 +11,7 @@ import java.util.HashMap; import java.util.Map; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Assertions; diff --git a/spring/spring-cloud-config/src/main/java/io/quarkus/ts/spring/cloud/config/ConfigMappingGreetingResource.java b/spring/spring-cloud-config/src/main/java/io/quarkus/ts/spring/cloud/config/ConfigMappingGreetingResource.java index 0d7c7f5dbf..4f34f9c727 100644 --- a/spring/spring-cloud-config/src/main/java/io/quarkus/ts/spring/cloud/config/ConfigMappingGreetingResource.java +++ b/spring/spring-cloud-config/src/main/java/io/quarkus/ts/spring/cloud/config/ConfigMappingGreetingResource.java @@ -1,8 +1,8 @@ package io.quarkus.ts.spring.cloud.config; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; @Path("/custom-mapping/hello") public class ConfigMappingGreetingResource { diff --git a/spring/spring-cloud-config/src/main/java/io/quarkus/ts/spring/cloud/config/JaxRsGreetingResource.java b/spring/spring-cloud-config/src/main/java/io/quarkus/ts/spring/cloud/config/JaxRsGreetingResource.java index 6b21ed4a69..e86aec9131 100644 --- a/spring/spring-cloud-config/src/main/java/io/quarkus/ts/spring/cloud/config/JaxRsGreetingResource.java +++ b/spring/spring-cloud-config/src/main/java/io/quarkus/ts/spring/cloud/config/JaxRsGreetingResource.java @@ -1,7 +1,7 @@ package io.quarkus.ts.spring.cloud.config; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import org.eclipse.microprofile.config.inject.ConfigProperty; diff --git a/spring/spring-data/src/main/java/io/quarkus/ts/spring/data/di/ListInjectionBean.java b/spring/spring-data/src/main/java/io/quarkus/ts/spring/data/di/ListInjectionBean.java index 8a970ae4de..6b4b8606a8 100644 --- a/spring/spring-data/src/main/java/io/quarkus/ts/spring/data/di/ListInjectionBean.java +++ b/spring/spring-data/src/main/java/io/quarkus/ts/spring/data/di/ListInjectionBean.java @@ -2,7 +2,7 @@ import java.util.List; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.springframework.beans.factory.annotation.Autowired; diff --git a/spring/spring-data/src/main/java/io/quarkus/ts/spring/data/primitivetypes/BookResource.java b/spring/spring-data/src/main/java/io/quarkus/ts/spring/data/primitivetypes/BookResource.java index aa291f3f59..852a4f91e2 100644 --- a/spring/spring-data/src/main/java/io/quarkus/ts/spring/data/primitivetypes/BookResource.java +++ b/spring/spring-data/src/main/java/io/quarkus/ts/spring/data/primitivetypes/BookResource.java @@ -2,13 +2,13 @@ import java.util.List; -import javax.ws.rs.GET; -import javax.ws.rs.NotFoundException; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; diff --git a/spring/spring-data/src/main/java/io/quarkus/ts/spring/data/primitivetypes/BookStore.java b/spring/spring-data/src/main/java/io/quarkus/ts/spring/data/primitivetypes/BookStore.java index faa8e2dde7..7bc26ac410 100644 --- a/spring/spring-data/src/main/java/io/quarkus/ts/spring/data/primitivetypes/BookStore.java +++ b/spring/spring-data/src/main/java/io/quarkus/ts/spring/data/primitivetypes/BookStore.java @@ -1,6 +1,6 @@ package io.quarkus.ts.spring.data.primitivetypes; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageImpl; diff --git a/spring/spring-data/src/main/java/io/quarkus/ts/spring/data/primitivetypes/CatResource.java b/spring/spring-data/src/main/java/io/quarkus/ts/spring/data/primitivetypes/CatResource.java index 65b081688f..ef6b5f99aa 100644 --- a/spring/spring-data/src/main/java/io/quarkus/ts/spring/data/primitivetypes/CatResource.java +++ b/spring/spring-data/src/main/java/io/quarkus/ts/spring/data/primitivetypes/CatResource.java @@ -2,10 +2,10 @@ import java.util.List; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; import io.quarkus.ts.spring.data.primitivetypes.model.Cat; diff --git a/spring/spring-data/src/main/java/io/quarkus/ts/spring/data/primitivetypes/HttpCommonsHeaders.java b/spring/spring-data/src/main/java/io/quarkus/ts/spring/data/primitivetypes/HttpCommonsHeaders.java index 7525d5f193..a849224674 100644 --- a/spring/spring-data/src/main/java/io/quarkus/ts/spring/data/primitivetypes/HttpCommonsHeaders.java +++ b/spring/spring-data/src/main/java/io/quarkus/ts/spring/data/primitivetypes/HttpCommonsHeaders.java @@ -1,11 +1,11 @@ package io.quarkus.ts.spring.data.primitivetypes; -import javax.inject.Inject; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerResponseContext; -import javax.ws.rs.container.ContainerResponseFilter; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.ext.Provider; +import jakarta.inject.Inject; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerResponseContext; +import jakarta.ws.rs.container.ContainerResponseFilter; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.ext.Provider; import io.quarkus.ts.spring.data.primitivetypes.configuration.AppConfiguration; import io.quarkus.ts.spring.data.primitivetypes.configuration.InstanceIdBean; diff --git a/spring/spring-data/src/main/java/io/quarkus/ts/spring/data/primitivetypes/configuration/AppConfiguration.java b/spring/spring-data/src/main/java/io/quarkus/ts/spring/data/primitivetypes/configuration/AppConfiguration.java index f5a7e9446a..e7b942c0fa 100644 --- a/spring/spring-data/src/main/java/io/quarkus/ts/spring/data/primitivetypes/configuration/AppConfiguration.java +++ b/spring/spring-data/src/main/java/io/quarkus/ts/spring/data/primitivetypes/configuration/AppConfiguration.java @@ -3,7 +3,7 @@ import java.util.UUID; import java.util.concurrent.atomic.AtomicInteger; -import javax.enterprise.inject.spi.CDI; +import jakarta.enterprise.inject.spi.CDI; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/spring/spring-data/src/main/java/io/quarkus/ts/spring/data/primitivetypes/model/Address.java b/spring/spring-data/src/main/java/io/quarkus/ts/spring/data/primitivetypes/model/Address.java index 8c21908d36..ddea9a72c9 100644 --- a/spring/spring-data/src/main/java/io/quarkus/ts/spring/data/primitivetypes/model/Address.java +++ b/spring/spring-data/src/main/java/io/quarkus/ts/spring/data/primitivetypes/model/Address.java @@ -2,11 +2,11 @@ import java.util.List; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import com.fasterxml.jackson.annotation.JsonIgnore; diff --git a/spring/spring-data/src/main/java/io/quarkus/ts/spring/data/primitivetypes/model/Animal.java b/spring/spring-data/src/main/java/io/quarkus/ts/spring/data/primitivetypes/model/Animal.java index 8aacaa336c..4c31335c9c 100644 --- a/spring/spring-data/src/main/java/io/quarkus/ts/spring/data/primitivetypes/model/Animal.java +++ b/spring/spring-data/src/main/java/io/quarkus/ts/spring/data/primitivetypes/model/Animal.java @@ -2,10 +2,10 @@ import java.time.LocalDateTime; -import javax.persistence.Column; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.Column; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; //This is for regression test for https://github.com/quarkusio/quarkus/pull/13015 @MappedSuperclass diff --git a/spring/spring-data/src/main/java/io/quarkus/ts/spring/data/primitivetypes/model/Book.java b/spring/spring-data/src/main/java/io/quarkus/ts/spring/data/primitivetypes/model/Book.java index 8c276e0973..fb20a6e775 100644 --- a/spring/spring-data/src/main/java/io/quarkus/ts/spring/data/primitivetypes/model/Book.java +++ b/spring/spring-data/src/main/java/io/quarkus/ts/spring/data/primitivetypes/model/Book.java @@ -2,12 +2,12 @@ import java.util.Map; -import javax.persistence.Column; -import javax.persistence.Convert; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; +import jakarta.persistence.Column; +import jakarta.persistence.Convert; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; @Entity public class Book extends NamedEntity { diff --git a/spring/spring-data/src/main/java/io/quarkus/ts/spring/data/primitivetypes/model/Cat.java b/spring/spring-data/src/main/java/io/quarkus/ts/spring/data/primitivetypes/model/Cat.java index 852185de2e..f5b622acd4 100644 --- a/spring/spring-data/src/main/java/io/quarkus/ts/spring/data/primitivetypes/model/Cat.java +++ b/spring/spring-data/src/main/java/io/quarkus/ts/spring/data/primitivetypes/model/Cat.java @@ -1,6 +1,6 @@ package io.quarkus.ts.spring.data.primitivetypes.model; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class Cat extends Mammal { diff --git a/spring/spring-data/src/main/java/io/quarkus/ts/spring/data/primitivetypes/model/Mammal.java b/spring/spring-data/src/main/java/io/quarkus/ts/spring/data/primitivetypes/model/Mammal.java index 7a4664f43f..759c0e3f6d 100644 --- a/spring/spring-data/src/main/java/io/quarkus/ts/spring/data/primitivetypes/model/Mammal.java +++ b/spring/spring-data/src/main/java/io/quarkus/ts/spring/data/primitivetypes/model/Mammal.java @@ -1,6 +1,6 @@ package io.quarkus.ts.spring.data.primitivetypes.model; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.MappedSuperclass; //This is for regression test for https://github.com/quarkusio/quarkus/pull/13015 @MappedSuperclass diff --git a/spring/spring-data/src/main/java/io/quarkus/ts/spring/data/primitivetypes/model/MapStringConverter.java b/spring/spring-data/src/main/java/io/quarkus/ts/spring/data/primitivetypes/model/MapStringConverter.java index 8019fce55c..5b78cfaf47 100644 --- a/spring/spring-data/src/main/java/io/quarkus/ts/spring/data/primitivetypes/model/MapStringConverter.java +++ b/spring/spring-data/src/main/java/io/quarkus/ts/spring/data/primitivetypes/model/MapStringConverter.java @@ -5,7 +5,7 @@ import java.util.Map; import java.util.Optional; -import javax.persistence.AttributeConverter; +import jakarta.persistence.AttributeConverter; import org.jboss.logging.Logger; diff --git a/spring/spring-data/src/main/java/io/quarkus/ts/spring/data/primitivetypes/model/NamedEntity.java b/spring/spring-data/src/main/java/io/quarkus/ts/spring/data/primitivetypes/model/NamedEntity.java index 9a612818d9..f8a3fb8a7e 100644 --- a/spring/spring-data/src/main/java/io/quarkus/ts/spring/data/primitivetypes/model/NamedEntity.java +++ b/spring/spring-data/src/main/java/io/quarkus/ts/spring/data/primitivetypes/model/NamedEntity.java @@ -1,6 +1,6 @@ package io.quarkus.ts.spring.data.primitivetypes.model; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.MappedSuperclass; @MappedSuperclass public class NamedEntity { diff --git a/spring/spring-data/src/main/java/io/quarkus/ts/spring/data/rest/Article.java b/spring/spring-data/src/main/java/io/quarkus/ts/spring/data/rest/Article.java index 1824a17b03..b69a3cb532 100644 --- a/spring/spring-data/src/main/java/io/quarkus/ts/spring/data/rest/Article.java +++ b/spring/spring-data/src/main/java/io/quarkus/ts/spring/data/rest/Article.java @@ -1,13 +1,13 @@ package io.quarkus.ts.spring.data.rest; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.validation.constraints.NotBlank; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.validation.constraints.NotBlank; import org.hibernate.validator.constraints.Length; diff --git a/spring/spring-data/src/main/java/io/quarkus/ts/spring/data/rest/Library.java b/spring/spring-data/src/main/java/io/quarkus/ts/spring/data/rest/Library.java index 20a8d276fa..6f7fb09ae0 100644 --- a/spring/spring-data/src/main/java/io/quarkus/ts/spring/data/rest/Library.java +++ b/spring/spring-data/src/main/java/io/quarkus/ts/spring/data/rest/Library.java @@ -3,13 +3,13 @@ import java.util.ArrayList; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.validation.constraints.NotBlank; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.validation.constraints.NotBlank; import com.fasterxml.jackson.annotation.JsonManagedReference; diff --git a/spring/spring-data/src/main/java/io/quarkus/ts/spring/data/rest/secured/DenyAllRepository.java b/spring/spring-data/src/main/java/io/quarkus/ts/spring/data/rest/secured/DenyAllRepository.java index d8a17af99b..f63dbb47ca 100644 --- a/spring/spring-data/src/main/java/io/quarkus/ts/spring/data/rest/secured/DenyAllRepository.java +++ b/spring/spring-data/src/main/java/io/quarkus/ts/spring/data/rest/secured/DenyAllRepository.java @@ -2,9 +2,9 @@ import java.util.Optional; -import javax.annotation.security.DenyAll; -import javax.annotation.security.PermitAll; -import javax.annotation.security.RolesAllowed; +import jakarta.annotation.security.DenyAll; +import jakarta.annotation.security.PermitAll; +import jakarta.annotation.security.RolesAllowed; import org.springframework.data.repository.CrudRepository; import org.springframework.data.rest.core.annotation.RepositoryRestResource; diff --git a/spring/spring-data/src/main/java/io/quarkus/ts/spring/data/rest/secured/PermitAllRepository.java b/spring/spring-data/src/main/java/io/quarkus/ts/spring/data/rest/secured/PermitAllRepository.java index c5cfdac3a7..1d0be86d31 100644 --- a/spring/spring-data/src/main/java/io/quarkus/ts/spring/data/rest/secured/PermitAllRepository.java +++ b/spring/spring-data/src/main/java/io/quarkus/ts/spring/data/rest/secured/PermitAllRepository.java @@ -1,7 +1,7 @@ package io.quarkus.ts.spring.data.rest.secured; -import javax.annotation.security.DenyAll; -import javax.annotation.security.PermitAll; +import jakarta.annotation.security.DenyAll; +import jakarta.annotation.security.PermitAll; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; diff --git a/spring/spring-data/src/main/java/io/quarkus/ts/spring/data/rest/secured/PublicRepository.java b/spring/spring-data/src/main/java/io/quarkus/ts/spring/data/rest/secured/PublicRepository.java index d6235a84b1..22efbb5c3d 100644 --- a/spring/spring-data/src/main/java/io/quarkus/ts/spring/data/rest/secured/PublicRepository.java +++ b/spring/spring-data/src/main/java/io/quarkus/ts/spring/data/rest/secured/PublicRepository.java @@ -1,6 +1,6 @@ package io.quarkus.ts.spring.data.rest.secured; -import javax.annotation.security.DenyAll; +import jakarta.annotation.security.DenyAll; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; diff --git a/spring/spring-data/src/main/java/io/quarkus/ts/spring/data/rest/secured/RolesAllowedRepository.java b/spring/spring-data/src/main/java/io/quarkus/ts/spring/data/rest/secured/RolesAllowedRepository.java index 32e282d699..03265f0a38 100644 --- a/spring/spring-data/src/main/java/io/quarkus/ts/spring/data/rest/secured/RolesAllowedRepository.java +++ b/spring/spring-data/src/main/java/io/quarkus/ts/spring/data/rest/secured/RolesAllowedRepository.java @@ -2,8 +2,8 @@ import java.util.Optional; -import javax.annotation.security.PermitAll; -import javax.annotation.security.RolesAllowed; +import jakarta.annotation.security.PermitAll; +import jakarta.annotation.security.RolesAllowed; import org.springframework.data.repository.CrudRepository; import org.springframework.data.rest.core.annotation.RepositoryRestResource; diff --git a/spring/spring-data/src/test/java/io/quarkus/ts/spring/data/di/SpringDiTest.java b/spring/spring-data/src/test/java/io/quarkus/ts/spring/data/di/SpringDiTest.java index 11502f3564..24dab5df2f 100644 --- a/spring/spring-data/src/test/java/io/quarkus/ts/spring/data/di/SpringDiTest.java +++ b/spring/spring-data/src/test/java/io/quarkus/ts/spring/data/di/SpringDiTest.java @@ -5,7 +5,7 @@ import java.util.stream.Stream; -import javax.enterprise.inject.spi.CDI; +import jakarta.enterprise.inject.spi.CDI; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; @@ -17,7 +17,7 @@ import io.quarkus.arc.InjectableBean; import io.quarkus.test.junit.QuarkusTest; -// Not converted into @QuarkusScenario, because invoking javax.enterprise.inject.spi.CDI / io.quarkus.arc.Arc is not supported. +// Not converted into @QuarkusScenario, because invoking jakarta.enterprise.inject.spi.CDI / io.quarkus.arc.Arc is not supported. // TODO: Workaround by implementing REST endpoints which expose all necessary information. @Tag("fips-incompatible") // native-mode @QuarkusTest diff --git a/spring/spring-properties/src/main/java/io/quarkus/ts/spring/properties/CollectionsController.java b/spring/spring-properties/src/main/java/io/quarkus/ts/spring/properties/CollectionsController.java index be439b5380..b87194475b 100644 --- a/spring/spring-properties/src/main/java/io/quarkus/ts/spring/properties/CollectionsController.java +++ b/spring/spring-properties/src/main/java/io/quarkus/ts/spring/properties/CollectionsController.java @@ -2,7 +2,7 @@ import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/spring/spring-web-reactive/src/main/java/io/quarkus/ts/spring/web/reactive/boostrap/persistence/model/Book.java b/spring/spring-web-reactive/src/main/java/io/quarkus/ts/spring/web/reactive/boostrap/persistence/model/Book.java index bd92cc9c9b..f8ef7c2c75 100644 --- a/spring/spring-web-reactive/src/main/java/io/quarkus/ts/spring/web/reactive/boostrap/persistence/model/Book.java +++ b/spring/spring-web-reactive/src/main/java/io/quarkus/ts/spring/web/reactive/boostrap/persistence/model/Book.java @@ -1,10 +1,10 @@ package io.quarkus.ts.spring.web.reactive.boostrap.persistence.model; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; @Entity public class Book { diff --git a/spring/spring-web-reactive/src/main/java/io/quarkus/ts/spring/web/reactive/boostrap/persistence/repo/BookRepository.java b/spring/spring-web-reactive/src/main/java/io/quarkus/ts/spring/web/reactive/boostrap/persistence/repo/BookRepository.java index 73b4aab35f..064897daeb 100644 --- a/spring/spring-web-reactive/src/main/java/io/quarkus/ts/spring/web/reactive/boostrap/persistence/repo/BookRepository.java +++ b/spring/spring-web-reactive/src/main/java/io/quarkus/ts/spring/web/reactive/boostrap/persistence/repo/BookRepository.java @@ -1,6 +1,6 @@ package io.quarkus.ts.spring.web.reactive.boostrap.persistence.repo; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import io.quarkus.hibernate.reactive.panache.PanacheRepository; import io.quarkus.ts.spring.web.reactive.boostrap.persistence.model.Book; @@ -9,6 +9,6 @@ @ApplicationScoped public class BookRepository implements PanacheRepository { public Multi findByTitle(String title) { - return find("title", title).stream(); + return find("title", title).list().toMulti().flatMap(l -> Multi.createFrom().items(l.stream())); } } diff --git a/spring/spring-web-reactive/src/main/java/io/quarkus/ts/spring/web/reactive/boostrap/web/BookController.java b/spring/spring-web-reactive/src/main/java/io/quarkus/ts/spring/web/reactive/boostrap/web/BookController.java index b7e43d312a..1de6ea5863 100644 --- a/spring/spring-web-reactive/src/main/java/io/quarkus/ts/spring/web/reactive/boostrap/web/BookController.java +++ b/spring/spring-web-reactive/src/main/java/io/quarkus/ts/spring/web/reactive/boostrap/web/BookController.java @@ -1,16 +1,16 @@ package io.quarkus.ts.spring.web.reactive.boostrap.web; -import static javax.ws.rs.core.Response.Status.CREATED; -import static javax.ws.rs.core.Response.Status.NOT_FOUND; -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.NOT_FOUND; +import static jakarta.ws.rs.core.Response.Status.NO_CONTENT; import java.time.Duration; import java.util.Collections; import java.util.List; -import javax.ws.rs.Consumes; -import javax.ws.rs.Produces; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.Response; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.DeleteMapping; diff --git a/spring/spring-web-reactive/src/main/java/io/quarkus/ts/spring/web/reactive/boostrap/web/RestExceptionHandler.java b/spring/spring-web-reactive/src/main/java/io/quarkus/ts/spring/web/reactive/boostrap/web/RestExceptionHandler.java index c0bda456bf..1faee2adcf 100644 --- a/spring/spring-web-reactive/src/main/java/io/quarkus/ts/spring/web/reactive/boostrap/web/RestExceptionHandler.java +++ b/spring/spring-web-reactive/src/main/java/io/quarkus/ts/spring/web/reactive/boostrap/web/RestExceptionHandler.java @@ -1,6 +1,6 @@ package io.quarkus.ts.spring.web.reactive.boostrap.web; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import org.hibernate.exception.ConstraintViolationException; import org.springframework.http.HttpStatus; diff --git a/spring/spring-web-reactive/src/main/java/io/quarkus/ts/spring/web/reactive/boostrap/web/SimpleController.java b/spring/spring-web-reactive/src/main/java/io/quarkus/ts/spring/web/reactive/boostrap/web/SimpleController.java index 0c1c208e48..0948f6c4d8 100644 --- a/spring/spring-web-reactive/src/main/java/io/quarkus/ts/spring/web/reactive/boostrap/web/SimpleController.java +++ b/spring/spring-web-reactive/src/main/java/io/quarkus/ts/spring/web/reactive/boostrap/web/SimpleController.java @@ -1,6 +1,6 @@ package io.quarkus.ts.spring.web.reactive.boostrap.web; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; diff --git a/spring/spring-web-reactive/src/main/java/io/quarkus/ts/spring/web/reactive/boostrap/web/exception/BookIdMismatchException.java b/spring/spring-web-reactive/src/main/java/io/quarkus/ts/spring/web/reactive/boostrap/web/exception/BookIdMismatchException.java index 6d19333685..dbce57d31f 100644 --- a/spring/spring-web-reactive/src/main/java/io/quarkus/ts/spring/web/reactive/boostrap/web/exception/BookIdMismatchException.java +++ b/spring/spring-web-reactive/src/main/java/io/quarkus/ts/spring/web/reactive/boostrap/web/exception/BookIdMismatchException.java @@ -1,6 +1,6 @@ package io.quarkus.ts.spring.web.reactive.boostrap.web.exception; -import javax.ws.rs.WebApplicationException; +import jakarta.ws.rs.WebApplicationException; public class BookIdMismatchException extends WebApplicationException { diff --git a/spring/spring-web-reactive/src/main/java/io/quarkus/ts/spring/web/reactive/boostrap/web/exception/BookNotFoundException.java b/spring/spring-web-reactive/src/main/java/io/quarkus/ts/spring/web/reactive/boostrap/web/exception/BookNotFoundException.java index d1149d90cb..b74cc0aa98 100644 --- a/spring/spring-web-reactive/src/main/java/io/quarkus/ts/spring/web/reactive/boostrap/web/exception/BookNotFoundException.java +++ b/spring/spring-web-reactive/src/main/java/io/quarkus/ts/spring/web/reactive/boostrap/web/exception/BookNotFoundException.java @@ -1,6 +1,6 @@ package io.quarkus.ts.spring.web.reactive.boostrap.web.exception; -import javax.ws.rs.WebApplicationException; +import jakarta.ws.rs.WebApplicationException; public class BookNotFoundException extends WebApplicationException { diff --git a/spring/spring-web/src/main/java/io/quarkus/ts/spring/web/reactive/boostrap/persistence/model/Book.java b/spring/spring-web/src/main/java/io/quarkus/ts/spring/web/reactive/boostrap/persistence/model/Book.java index bd92cc9c9b..f8ef7c2c75 100644 --- a/spring/spring-web/src/main/java/io/quarkus/ts/spring/web/reactive/boostrap/persistence/model/Book.java +++ b/spring/spring-web/src/main/java/io/quarkus/ts/spring/web/reactive/boostrap/persistence/model/Book.java @@ -1,10 +1,10 @@ package io.quarkus.ts.spring.web.reactive.boostrap.persistence.model; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; @Entity public class Book { diff --git a/spring/spring-web/src/main/java/io/quarkus/ts/spring/web/reactive/boostrap/persistence/repo/BookRepository.java b/spring/spring-web/src/main/java/io/quarkus/ts/spring/web/reactive/boostrap/persistence/repo/BookRepository.java index 1f0cc35da1..ed93b9b3b5 100644 --- a/spring/spring-web/src/main/java/io/quarkus/ts/spring/web/reactive/boostrap/persistence/repo/BookRepository.java +++ b/spring/spring-web/src/main/java/io/quarkus/ts/spring/web/reactive/boostrap/persistence/repo/BookRepository.java @@ -2,7 +2,7 @@ import java.util.List; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import io.quarkus.hibernate.orm.panache.PanacheRepository; import io.quarkus.ts.spring.web.reactive.boostrap.persistence.model.Book; diff --git a/spring/spring-web/src/main/java/io/quarkus/ts/spring/web/reactive/boostrap/web/BookController.java b/spring/spring-web/src/main/java/io/quarkus/ts/spring/web/reactive/boostrap/web/BookController.java index 990f6aa417..19556fa771 100644 --- a/spring/spring-web/src/main/java/io/quarkus/ts/spring/web/reactive/boostrap/web/BookController.java +++ b/spring/spring-web/src/main/java/io/quarkus/ts/spring/web/reactive/boostrap/web/BookController.java @@ -2,7 +2,7 @@ import java.util.List; -import javax.transaction.Transactional; +import jakarta.transaction.Transactional; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; diff --git a/spring/spring-web/src/main/java/io/quarkus/ts/spring/web/reactive/boostrap/web/RestExceptionHandler.java b/spring/spring-web/src/main/java/io/quarkus/ts/spring/web/reactive/boostrap/web/RestExceptionHandler.java index c0bda456bf..1faee2adcf 100644 --- a/spring/spring-web/src/main/java/io/quarkus/ts/spring/web/reactive/boostrap/web/RestExceptionHandler.java +++ b/spring/spring-web/src/main/java/io/quarkus/ts/spring/web/reactive/boostrap/web/RestExceptionHandler.java @@ -1,6 +1,6 @@ package io.quarkus.ts.spring.web.reactive.boostrap.web; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import org.hibernate.exception.ConstraintViolationException; import org.springframework.http.HttpStatus; diff --git a/spring/spring-web/src/main/java/io/quarkus/ts/spring/web/reactive/boostrap/web/SimpleController.java b/spring/spring-web/src/main/java/io/quarkus/ts/spring/web/reactive/boostrap/web/SimpleController.java index 88fed81732..3bed6190bc 100644 --- a/spring/spring-web/src/main/java/io/quarkus/ts/spring/web/reactive/boostrap/web/SimpleController.java +++ b/spring/spring-web/src/main/java/io/quarkus/ts/spring/web/reactive/boostrap/web/SimpleController.java @@ -1,7 +1,7 @@ package io.quarkus.ts.spring.web.reactive.boostrap.web; -import javax.inject.Inject; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +import jakarta.ws.rs.core.MediaType; import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/sql-db/hibernate-fulltext-search/src/main/java/io/quarkus/ts/hibernate/search/AnalysisConfigurer.java b/sql-db/hibernate-fulltext-search/src/main/java/io/quarkus/ts/hibernate/search/AnalysisConfigurer.java index f1037eb49a..b504c91606 100644 --- a/sql-db/hibernate-fulltext-search/src/main/java/io/quarkus/ts/hibernate/search/AnalysisConfigurer.java +++ b/sql-db/hibernate-fulltext-search/src/main/java/io/quarkus/ts/hibernate/search/AnalysisConfigurer.java @@ -1,7 +1,7 @@ package io.quarkus.ts.hibernate.search; -import javax.enterprise.context.Dependent; -import javax.inject.Named; +import jakarta.enterprise.context.Dependent; +import jakarta.inject.Named; import org.hibernate.search.backend.elasticsearch.analysis.ElasticsearchAnalysisConfigurationContext; import org.hibernate.search.backend.elasticsearch.analysis.ElasticsearchAnalysisConfigurer; diff --git a/sql-db/hibernate-fulltext-search/src/main/java/io/quarkus/ts/hibernate/search/CustomTenantResolver.java b/sql-db/hibernate-fulltext-search/src/main/java/io/quarkus/ts/hibernate/search/CustomTenantResolver.java index 45f5940f6d..749926066b 100644 --- a/sql-db/hibernate-fulltext-search/src/main/java/io/quarkus/ts/hibernate/search/CustomTenantResolver.java +++ b/sql-db/hibernate-fulltext-search/src/main/java/io/quarkus/ts/hibernate/search/CustomTenantResolver.java @@ -1,7 +1,7 @@ package io.quarkus.ts.hibernate.search; -import javax.enterprise.context.RequestScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.RequestScoped; +import jakarta.inject.Inject; import org.jboss.logging.Logger; diff --git a/sql-db/hibernate-fulltext-search/src/main/java/io/quarkus/ts/hibernate/search/Fruit.java b/sql-db/hibernate-fulltext-search/src/main/java/io/quarkus/ts/hibernate/search/Fruit.java index 2059b496c5..426b2dc448 100644 --- a/sql-db/hibernate-fulltext-search/src/main/java/io/quarkus/ts/hibernate/search/Fruit.java +++ b/sql-db/hibernate-fulltext-search/src/main/java/io/quarkus/ts/hibernate/search/Fruit.java @@ -1,12 +1,12 @@ package io.quarkus.ts.hibernate.search; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.NamedQuery; -import javax.persistence.Table; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.Table; +import jakarta.xml.bind.annotation.XmlRootElement; import org.hibernate.annotations.GenericGenerator; import org.hibernate.search.engine.backend.types.Sortable; diff --git a/sql-db/hibernate-fulltext-search/src/main/java/io/quarkus/ts/hibernate/search/FruitResource.java b/sql-db/hibernate-fulltext-search/src/main/java/io/quarkus/ts/hibernate/search/FruitResource.java index 30e4ac9b08..aed0eca9fd 100644 --- a/sql-db/hibernate-fulltext-search/src/main/java/io/quarkus/ts/hibernate/search/FruitResource.java +++ b/sql-db/hibernate-fulltext-search/src/main/java/io/quarkus/ts/hibernate/search/FruitResource.java @@ -2,21 +2,21 @@ import java.util.List; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import javax.persistence.EntityManager; -import javax.transaction.Transactional; -import javax.ws.rs.Consumes; -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.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.Response; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; +import jakarta.persistence.EntityManager; +import jakarta.transaction.Transactional; +import jakarta.ws.rs.Consumes; +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.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.Response; import org.hibernate.search.mapper.orm.session.SearchSession; import org.jboss.logging.Logger; diff --git a/sql-db/hibernate-fulltext-search/src/test/java/io/quarkus/ts/hibernate/search/AbstractMultitenantHibernateSearchIT.java b/sql-db/hibernate-fulltext-search/src/test/java/io/quarkus/ts/hibernate/search/AbstractMultitenantHibernateSearchIT.java index 15ca8fea18..317afa42f2 100644 --- a/sql-db/hibernate-fulltext-search/src/test/java/io/quarkus/ts/hibernate/search/AbstractMultitenantHibernateSearchIT.java +++ b/sql-db/hibernate-fulltext-search/src/test/java/io/quarkus/ts/hibernate/search/AbstractMultitenantHibernateSearchIT.java @@ -9,7 +9,7 @@ import java.util.List; import java.util.stream.Collectors; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import org.junit.jupiter.api.Test; diff --git a/sql-db/hibernate-reactive/src/main/java/io/quarkus/ts/hibernate/reactive/database/Author.java b/sql-db/hibernate-reactive/src/main/java/io/quarkus/ts/hibernate/reactive/database/Author.java index 1d9a9823b9..69fbaf5fb2 100644 --- a/sql-db/hibernate-reactive/src/main/java/io/quarkus/ts/hibernate/reactive/database/Author.java +++ b/sql-db/hibernate-reactive/src/main/java/io/quarkus/ts/hibernate/reactive/database/Author.java @@ -1,19 +1,19 @@ package io.quarkus.ts.hibernate.reactive.database; -import static javax.persistence.CascadeType.PERSIST; +import static jakarta.persistence.CascadeType.PERSIST; import java.util.ArrayList; import java.util.List; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; import org.hibernate.annotations.GenericGenerator; diff --git a/sql-db/hibernate-reactive/src/main/java/io/quarkus/ts/hibernate/reactive/database/AuthorRepository.java b/sql-db/hibernate-reactive/src/main/java/io/quarkus/ts/hibernate/reactive/database/AuthorRepository.java index 9df0f6a6e5..7a6df8bcdd 100644 --- a/sql-db/hibernate-reactive/src/main/java/io/quarkus/ts/hibernate/reactive/database/AuthorRepository.java +++ b/sql-db/hibernate-reactive/src/main/java/io/quarkus/ts/hibernate/reactive/database/AuthorRepository.java @@ -1,9 +1,10 @@ package io.quarkus.ts.hibernate.reactive.database; -import javax.enterprise.context.ApplicationScoped; +import java.util.List; + +import jakarta.enterprise.context.ApplicationScoped; import io.quarkus.hibernate.reactive.panache.PanacheRepositoryBase; -import io.smallrye.mutiny.Multi; import io.smallrye.mutiny.Uni; @ApplicationScoped @@ -15,7 +16,7 @@ public Uni create(String name) { return persistAndFlush(author); } - public Multi findByName(String name) { - return find("name", name).stream(); + public Uni> findByName(String name) { + return find("name", name).list(); } } diff --git a/sql-db/hibernate-reactive/src/main/java/io/quarkus/ts/hibernate/reactive/database/Book.java b/sql-db/hibernate-reactive/src/main/java/io/quarkus/ts/hibernate/reactive/database/Book.java index 149ad49d4c..002ff582d0 100644 --- a/sql-db/hibernate-reactive/src/main/java/io/quarkus/ts/hibernate/reactive/database/Book.java +++ b/sql-db/hibernate-reactive/src/main/java/io/quarkus/ts/hibernate/reactive/database/Book.java @@ -1,15 +1,15 @@ package io.quarkus.ts.hibernate.reactive.database; -import javax.persistence.Column; -import javax.persistence.Convert; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.NamedQuery; -import javax.persistence.Table; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; +import jakarta.persistence.Column; +import jakarta.persistence.Convert; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.Table; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; import io.quarkus.hibernate.reactive.panache.PanacheEntityBase; import io.smallrye.mutiny.Multi; @@ -44,7 +44,7 @@ public Book(String title) { } public static Multi all() { - return streamAll(); + return Book. listAll().toMulti().flatMap(l -> Multi.createFrom().items(l.stream())); } public static Uni byId(Integer id) { diff --git a/sql-db/hibernate-reactive/src/main/java/io/quarkus/ts/hibernate/reactive/database/ISBNConverter.java b/sql-db/hibernate-reactive/src/main/java/io/quarkus/ts/hibernate/reactive/database/ISBNConverter.java index 28da0bd5f2..a88db67500 100644 --- a/sql-db/hibernate-reactive/src/main/java/io/quarkus/ts/hibernate/reactive/database/ISBNConverter.java +++ b/sql-db/hibernate-reactive/src/main/java/io/quarkus/ts/hibernate/reactive/database/ISBNConverter.java @@ -1,7 +1,7 @@ package io.quarkus.ts.hibernate.reactive.database; -import javax.persistence.AttributeConverter; -import javax.persistence.Converter; +import jakarta.persistence.AttributeConverter; +import jakarta.persistence.Converter; @Converter public class ISBNConverter implements AttributeConverter { diff --git a/sql-db/hibernate-reactive/src/main/java/io/quarkus/ts/hibernate/reactive/http/ApplicationExceptionMapper.java b/sql-db/hibernate-reactive/src/main/java/io/quarkus/ts/hibernate/reactive/http/ApplicationExceptionMapper.java index 3c3c6b5fb6..ea6d98730d 100644 --- a/sql-db/hibernate-reactive/src/main/java/io/quarkus/ts/hibernate/reactive/http/ApplicationExceptionMapper.java +++ b/sql-db/hibernate-reactive/src/main/java/io/quarkus/ts/hibernate/reactive/http/ApplicationExceptionMapper.java @@ -1,10 +1,10 @@ package io.quarkus.ts.hibernate.reactive.http; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.ExceptionMapper; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.ExceptionMapper; +import jakarta.ws.rs.ext.Provider; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/sql-db/hibernate-reactive/src/main/java/io/quarkus/ts/hibernate/reactive/http/GroundedEndpoint.java b/sql-db/hibernate-reactive/src/main/java/io/quarkus/ts/hibernate/reactive/http/GroundedEndpoint.java index faecd90d03..ee262e3ba0 100644 --- a/sql-db/hibernate-reactive/src/main/java/io/quarkus/ts/hibernate/reactive/http/GroundedEndpoint.java +++ b/sql-db/hibernate-reactive/src/main/java/io/quarkus/ts/hibernate/reactive/http/GroundedEndpoint.java @@ -1,14 +1,14 @@ package io.quarkus.ts.hibernate.reactive.http; -import javax.inject.Inject; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.inject.Inject; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import org.eclipse.microprofile.rest.client.inject.RestClient; import org.hibernate.reactive.mutiny.Mutiny; diff --git a/sql-db/hibernate-reactive/src/main/java/io/quarkus/ts/hibernate/reactive/http/OtherResource.java b/sql-db/hibernate-reactive/src/main/java/io/quarkus/ts/hibernate/reactive/http/OtherResource.java index 5c85742732..9c2a169979 100644 --- a/sql-db/hibernate-reactive/src/main/java/io/quarkus/ts/hibernate/reactive/http/OtherResource.java +++ b/sql-db/hibernate-reactive/src/main/java/io/quarkus/ts/hibernate/reactive/http/OtherResource.java @@ -1,10 +1,10 @@ package io.quarkus.ts.hibernate.reactive.http; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import io.smallrye.mutiny.Uni; diff --git a/sql-db/hibernate-reactive/src/main/java/io/quarkus/ts/hibernate/reactive/http/PanacheEndpoint.java b/sql-db/hibernate-reactive/src/main/java/io/quarkus/ts/hibernate/reactive/http/PanacheEndpoint.java index c66fd9effe..6e683bada4 100644 --- a/sql-db/hibernate-reactive/src/main/java/io/quarkus/ts/hibernate/reactive/http/PanacheEndpoint.java +++ b/sql-db/hibernate-reactive/src/main/java/io/quarkus/ts/hibernate/reactive/http/PanacheEndpoint.java @@ -1,21 +1,25 @@ package io.quarkus.ts.hibernate.reactive.http; -import javax.inject.Inject; -import javax.ws.rs.Consumes; -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.Produces; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import java.util.Collection; +import java.util.List; +import java.util.stream.Collectors; + +import jakarta.inject.Inject; +import jakarta.ws.rs.Consumes; +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.Produces; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import io.quarkus.hibernate.reactive.panache.Panache; +import io.quarkus.hibernate.reactive.panache.common.WithSession; import io.quarkus.ts.hibernate.reactive.database.Author; import io.quarkus.ts.hibernate.reactive.database.AuthorRepository; import io.quarkus.ts.hibernate.reactive.database.Book; -import io.smallrye.mutiny.Multi; import io.smallrye.mutiny.Uni; @Path("/library") @@ -26,11 +30,14 @@ public class PanacheEndpoint { @Inject AuthorRepository authors; + @WithSession @GET @Path("books") - public Multi all() { + public Uni> all() { return Book.all() - .map(Book::getTitle); + .map(Book::getTitle) + .collect() + .asList(); } @GET @@ -82,19 +89,24 @@ public Uni createBook(Integer author, String name) { .map(Response.ResponseBuilder::build); } + @WithSession @GET @Path("books/author/{name}") - public Multi search(String name) { + public Uni> search(String name) { return authors.findByName(name) - .map(Author::getBooks) - .flatMap(Multi.createFrom()::iterable) - .map(Book::getTitle); + .map(Collection::stream) + .map(authorStream -> authorStream + .map(Author::getBooks) + .flatMap(Collection::stream) + .map(Book::getTitle) + .collect(Collectors.toList())); } + @WithSession @GET @Path("authors") - public Multi authors() { - return authors.streamAll(); + public Uni> authors() { + return authors.listAll(); } @GET diff --git a/sql-db/hibernate-reactive/src/main/java/io/quarkus/ts/hibernate/reactive/http/SomeApi.java b/sql-db/hibernate-reactive/src/main/java/io/quarkus/ts/hibernate/reactive/http/SomeApi.java index cd7f68420f..af7a680387 100644 --- a/sql-db/hibernate-reactive/src/main/java/io/quarkus/ts/hibernate/reactive/http/SomeApi.java +++ b/sql-db/hibernate-reactive/src/main/java/io/quarkus/ts/hibernate/reactive/http/SomeApi.java @@ -1,10 +1,10 @@ package io.quarkus.ts.hibernate.reactive.http; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; diff --git a/sql-db/hibernate/src/main/java/io/quarkus/qe/hibernate/items/Account.java b/sql-db/hibernate/src/main/java/io/quarkus/qe/hibernate/items/Account.java index 17d4c5c154..2bb418e257 100644 --- a/sql-db/hibernate/src/main/java/io/quarkus/qe/hibernate/items/Account.java +++ b/sql-db/hibernate/src/main/java/io/quarkus/qe/hibernate/items/Account.java @@ -4,17 +4,17 @@ import java.util.HashSet; import java.util.Set; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; @Entity public class Account { diff --git a/sql-db/hibernate/src/main/java/io/quarkus/qe/hibernate/items/Customer.java b/sql-db/hibernate/src/main/java/io/quarkus/qe/hibernate/items/Customer.java index c1938e175b..d7e2ca3802 100644 --- a/sql-db/hibernate/src/main/java/io/quarkus/qe/hibernate/items/Customer.java +++ b/sql-db/hibernate/src/main/java/io/quarkus/qe/hibernate/items/Customer.java @@ -2,15 +2,15 @@ import java.util.Date; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.OneToOne; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; -import javax.persistence.Version; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; +import jakarta.persistence.Version; @Entity public class Customer { diff --git a/sql-db/hibernate/src/main/java/io/quarkus/qe/hibernate/items/Item.java b/sql-db/hibernate/src/main/java/io/quarkus/qe/hibernate/items/Item.java index 9c0a78b3ae..88264ef08f 100644 --- a/sql-db/hibernate/src/main/java/io/quarkus/qe/hibernate/items/Item.java +++ b/sql-db/hibernate/src/main/java/io/quarkus/qe/hibernate/items/Item.java @@ -1,10 +1,10 @@ package io.quarkus.qe.hibernate.items; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; @Entity public class Item { diff --git a/sql-db/hibernate/src/main/java/io/quarkus/qe/hibernate/items/ItemsResource.java b/sql-db/hibernate/src/main/java/io/quarkus/qe/hibernate/items/ItemsResource.java index 0e317ebff3..a64886ca9d 100644 --- a/sql-db/hibernate/src/main/java/io/quarkus/qe/hibernate/items/ItemsResource.java +++ b/sql-db/hibernate/src/main/java/io/quarkus/qe/hibernate/items/ItemsResource.java @@ -1,13 +1,13 @@ package io.quarkus.qe.hibernate.items; -import javax.inject.Inject; -import javax.persistence.EntityManager; -import javax.persistence.TypedQuery; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.transaction.Transactional; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.inject.Inject; +import jakarta.persistence.EntityManager; +import jakarta.persistence.TypedQuery; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.transaction.Transactional; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; @Path("/items") @Transactional diff --git a/sql-db/hibernate/src/main/java/io/quarkus/qe/hibernate/items/Role.java b/sql-db/hibernate/src/main/java/io/quarkus/qe/hibernate/items/Role.java index a1dcff87d0..89bdef34ab 100644 --- a/sql-db/hibernate/src/main/java/io/quarkus/qe/hibernate/items/Role.java +++ b/sql-db/hibernate/src/main/java/io/quarkus/qe/hibernate/items/Role.java @@ -1,8 +1,8 @@ package io.quarkus.qe.hibernate.items; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity public class Role { diff --git a/sql-db/hibernate/src/main/java/io/quarkus/qe/hibernate/transaction/TransactionScopeBean.java b/sql-db/hibernate/src/main/java/io/quarkus/qe/hibernate/transaction/TransactionScopeBean.java index 17501412cb..4581e9359f 100644 --- a/sql-db/hibernate/src/main/java/io/quarkus/qe/hibernate/transaction/TransactionScopeBean.java +++ b/sql-db/hibernate/src/main/java/io/quarkus/qe/hibernate/transaction/TransactionScopeBean.java @@ -2,9 +2,9 @@ import java.util.concurrent.atomic.AtomicBoolean; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; -import javax.transaction.TransactionScoped; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; +import jakarta.transaction.TransactionScoped; @TransactionScoped public class TransactionScopeBean { diff --git a/sql-db/hibernate/src/main/java/io/quarkus/qe/hibernate/transaction/TransactionScopeBeanResource.java b/sql-db/hibernate/src/main/java/io/quarkus/qe/hibernate/transaction/TransactionScopeBeanResource.java index 88e60fbdd7..1e2f8e5a5e 100644 --- a/sql-db/hibernate/src/main/java/io/quarkus/qe/hibernate/transaction/TransactionScopeBeanResource.java +++ b/sql-db/hibernate/src/main/java/io/quarkus/qe/hibernate/transaction/TransactionScopeBeanResource.java @@ -1,10 +1,10 @@ package io.quarkus.qe.hibernate.transaction; -import javax.inject.Inject; -import javax.transaction.Transactional; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; +import jakarta.inject.Inject; +import jakarta.transaction.Transactional; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; @Path("/transaction-scope") public class TransactionScopeBeanResource { diff --git a/sql-db/hibernate/src/main/java/io/quarkus/qe/hibernate/validator/Hello.java b/sql-db/hibernate/src/main/java/io/quarkus/qe/hibernate/validator/Hello.java index 52ff92b874..cc6d795bd0 100644 --- a/sql-db/hibernate/src/main/java/io/quarkus/qe/hibernate/validator/Hello.java +++ b/sql-db/hibernate/src/main/java/io/quarkus/qe/hibernate/validator/Hello.java @@ -1,16 +1,16 @@ package io.quarkus.qe.hibernate.validator; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToOne; -import javax.validation.Valid; -import javax.validation.constraints.Size; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToOne; +import jakarta.validation.Valid; +import jakarta.validation.constraints.Size; import com.sun.istack.NotNull; diff --git a/sql-db/hibernate/src/main/java/io/quarkus/qe/hibernate/validator/Human.java b/sql-db/hibernate/src/main/java/io/quarkus/qe/hibernate/validator/Human.java index 5166a63991..32e7aca650 100644 --- a/sql-db/hibernate/src/main/java/io/quarkus/qe/hibernate/validator/Human.java +++ b/sql-db/hibernate/src/main/java/io/quarkus/qe/hibernate/validator/Human.java @@ -3,13 +3,13 @@ import java.util.HashSet; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.validation.Valid; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.validation.Valid; import org.hibernate.annotations.BatchSize; diff --git a/sql-db/hibernate/src/main/java/io/quarkus/qe/hibernate/validator/JpaAndHibernateValidatorResource.java b/sql-db/hibernate/src/main/java/io/quarkus/qe/hibernate/validator/JpaAndHibernateValidatorResource.java index b94c99f913..a85ae27b55 100644 --- a/sql-db/hibernate/src/main/java/io/quarkus/qe/hibernate/validator/JpaAndHibernateValidatorResource.java +++ b/sql-db/hibernate/src/main/java/io/quarkus/qe/hibernate/validator/JpaAndHibernateValidatorResource.java @@ -4,14 +4,14 @@ import java.io.StringWriter; import java.util.UUID; -import javax.inject.Inject; -import javax.persistence.EntityManager; -import javax.transaction.Transactional; -import javax.validation.Validator; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +import jakarta.persistence.EntityManager; +import jakarta.transaction.Transactional; +import jakarta.validation.Validator; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; @Path("/hello") public class JpaAndHibernateValidatorResource { diff --git a/sql-db/hibernate/src/main/java/io/quarkus/qe/hibernate/validator/SomeChildEntity.java b/sql-db/hibernate/src/main/java/io/quarkus/qe/hibernate/validator/SomeChildEntity.java index 66455b19bb..57c2e2a305 100644 --- a/sql-db/hibernate/src/main/java/io/quarkus/qe/hibernate/validator/SomeChildEntity.java +++ b/sql-db/hibernate/src/main/java/io/quarkus/qe/hibernate/validator/SomeChildEntity.java @@ -1,12 +1,12 @@ package io.quarkus.qe.hibernate.validator; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.validation.constraints.NotNull; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.validation.constraints.NotNull; @Entity public class SomeChildEntity { diff --git a/sql-db/hibernate/src/main/java/io/quarkus/qe/hibernate/validator/SomeEntity.java b/sql-db/hibernate/src/main/java/io/quarkus/qe/hibernate/validator/SomeEntity.java index f01dcdb202..d1b51b7451 100644 --- a/sql-db/hibernate/src/main/java/io/quarkus/qe/hibernate/validator/SomeEntity.java +++ b/sql-db/hibernate/src/main/java/io/quarkus/qe/hibernate/validator/SomeEntity.java @@ -3,13 +3,13 @@ import java.util.HashSet; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.validation.Valid; -import javax.validation.constraints.Size; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.validation.Valid; +import jakarta.validation.constraints.Size; import org.hibernate.annotations.BatchSize; diff --git a/sql-db/multiple-pus/src/main/java/io/quarkus/ts/sqldb/multiplepus/ApplicationExceptionMapper.java b/sql-db/multiple-pus/src/main/java/io/quarkus/ts/sqldb/multiplepus/ApplicationExceptionMapper.java index 5f96b7643f..f62779ad90 100644 --- a/sql-db/multiple-pus/src/main/java/io/quarkus/ts/sqldb/multiplepus/ApplicationExceptionMapper.java +++ b/sql-db/multiple-pus/src/main/java/io/quarkus/ts/sqldb/multiplepus/ApplicationExceptionMapper.java @@ -1,10 +1,10 @@ package io.quarkus.ts.sqldb.multiplepus; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.ExceptionMapper; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.ExceptionMapper; +import jakarta.ws.rs.ext.Provider; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/sql-db/multiple-pus/src/main/java/io/quarkus/ts/sqldb/multiplepus/FruitResource.java b/sql-db/multiple-pus/src/main/java/io/quarkus/ts/sqldb/multiplepus/FruitResource.java index fd87bf8b2f..c4fa8d3726 100644 --- a/sql-db/multiple-pus/src/main/java/io/quarkus/ts/sqldb/multiplepus/FruitResource.java +++ b/sql-db/multiple-pus/src/main/java/io/quarkus/ts/sqldb/multiplepus/FruitResource.java @@ -1,26 +1,26 @@ package io.quarkus.ts.sqldb.multiplepus; -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; import java.util.List; -import javax.inject.Inject; -import javax.persistence.EntityManager; -import javax.transaction.Transactional; -import javax.validation.Valid; -import javax.ws.rs.ClientErrorException; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.NotFoundException; -import javax.ws.rs.POST; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.inject.Inject; +import jakarta.persistence.EntityManager; +import jakarta.transaction.Transactional; +import jakarta.validation.Valid; +import jakarta.ws.rs.ClientErrorException; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import io.quarkus.hibernate.orm.PersistenceUnit; import io.quarkus.panache.common.Sort; diff --git a/sql-db/multiple-pus/src/main/java/io/quarkus/ts/sqldb/multiplepus/NotFoundExceptionMapper.java b/sql-db/multiple-pus/src/main/java/io/quarkus/ts/sqldb/multiplepus/NotFoundExceptionMapper.java index be1f4aee67..781d789d49 100644 --- a/sql-db/multiple-pus/src/main/java/io/quarkus/ts/sqldb/multiplepus/NotFoundExceptionMapper.java +++ b/sql-db/multiple-pus/src/main/java/io/quarkus/ts/sqldb/multiplepus/NotFoundExceptionMapper.java @@ -1,9 +1,9 @@ package io.quarkus.ts.sqldb.multiplepus; -import javax.ws.rs.NotFoundException; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.ExceptionMapper; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.ExceptionMapper; +import jakarta.ws.rs.ext.Provider; // workaround for Quarkus providing its own NotFoundExceptionMapper // which is more specific than our ApplicationExceptionMapper diff --git a/sql-db/multiple-pus/src/main/java/io/quarkus/ts/sqldb/multiplepus/ValidationExceptionMapper.java b/sql-db/multiple-pus/src/main/java/io/quarkus/ts/sqldb/multiplepus/ValidationExceptionMapper.java index e6ab53ea53..cd9b122b0a 100644 --- a/sql-db/multiple-pus/src/main/java/io/quarkus/ts/sqldb/multiplepus/ValidationExceptionMapper.java +++ b/sql-db/multiple-pus/src/main/java/io/quarkus/ts/sqldb/multiplepus/ValidationExceptionMapper.java @@ -1,11 +1,11 @@ package io.quarkus.ts.sqldb.multiplepus; -import javax.validation.ConstraintViolation; -import javax.validation.ConstraintViolationException; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.ExceptionMapper; -import javax.ws.rs.ext.Provider; +import jakarta.validation.ConstraintViolation; +import jakarta.validation.ConstraintViolationException; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.ExceptionMapper; +import jakarta.ws.rs.ext.Provider; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ArrayNode; diff --git a/sql-db/multiple-pus/src/main/java/io/quarkus/ts/sqldb/multiplepus/VegetableResource.java b/sql-db/multiple-pus/src/main/java/io/quarkus/ts/sqldb/multiplepus/VegetableResource.java index 6af7c37b33..42dd2edccd 100644 --- a/sql-db/multiple-pus/src/main/java/io/quarkus/ts/sqldb/multiplepus/VegetableResource.java +++ b/sql-db/multiple-pus/src/main/java/io/quarkus/ts/sqldb/multiplepus/VegetableResource.java @@ -1,26 +1,26 @@ package io.quarkus.ts.sqldb.multiplepus; -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; import java.util.List; -import javax.inject.Inject; -import javax.persistence.EntityManager; -import javax.transaction.Transactional; -import javax.validation.Valid; -import javax.ws.rs.ClientErrorException; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.NotFoundException; -import javax.ws.rs.POST; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.inject.Inject; +import jakarta.persistence.EntityManager; +import jakarta.transaction.Transactional; +import jakarta.validation.Valid; +import jakarta.ws.rs.ClientErrorException; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import io.quarkus.hibernate.orm.PersistenceUnit; import io.quarkus.panache.common.Sort; diff --git a/sql-db/multiple-pus/src/main/java/io/quarkus/ts/sqldb/multiplepus/model/fruit/Fruit.java b/sql-db/multiple-pus/src/main/java/io/quarkus/ts/sqldb/multiplepus/model/fruit/Fruit.java index 4bb9eb4ff8..befb57f320 100644 --- a/sql-db/multiple-pus/src/main/java/io/quarkus/ts/sqldb/multiplepus/model/fruit/Fruit.java +++ b/sql-db/multiple-pus/src/main/java/io/quarkus/ts/sqldb/multiplepus/model/fruit/Fruit.java @@ -1,8 +1,8 @@ package io.quarkus.ts.sqldb.multiplepus.model.fruit; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.validation.constraints.NotBlank; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; +import jakarta.validation.constraints.NotBlank; import io.quarkus.hibernate.orm.panache.PanacheEntity; diff --git a/sql-db/multiple-pus/src/main/java/io/quarkus/ts/sqldb/multiplepus/model/vegetable/Vegetable.java b/sql-db/multiple-pus/src/main/java/io/quarkus/ts/sqldb/multiplepus/model/vegetable/Vegetable.java index a402cf2cb4..8cbee04628 100644 --- a/sql-db/multiple-pus/src/main/java/io/quarkus/ts/sqldb/multiplepus/model/vegetable/Vegetable.java +++ b/sql-db/multiple-pus/src/main/java/io/quarkus/ts/sqldb/multiplepus/model/vegetable/Vegetable.java @@ -1,8 +1,8 @@ package io.quarkus.ts.sqldb.multiplepus.model.vegetable; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.validation.constraints.NotBlank; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; +import jakarta.validation.constraints.NotBlank; import io.quarkus.hibernate.orm.panache.PanacheEntity; diff --git a/sql-db/multiple-pus/src/test/java/io/quarkus/ts/sqldb/multiplepus/AbstractMultiplePersistenceIT.java b/sql-db/multiple-pus/src/test/java/io/quarkus/ts/sqldb/multiplepus/AbstractMultiplePersistenceIT.java index 155fe5dcea..a2bb4991a5 100644 --- a/sql-db/multiple-pus/src/test/java/io/quarkus/ts/sqldb/multiplepus/AbstractMultiplePersistenceIT.java +++ b/sql-db/multiple-pus/src/test/java/io/quarkus/ts/sqldb/multiplepus/AbstractMultiplePersistenceIT.java @@ -1,6 +1,6 @@ package io.quarkus.ts.sqldb.multiplepus; -import static javax.ws.rs.core.Response.Status.NOT_FOUND; +import static jakarta.ws.rs.core.Response.Status.NOT_FOUND; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.Matchers.contains; import static org.hamcrest.Matchers.hasSize; diff --git a/sql-db/narayana-transactions/src/main/java/io.quarkus.ts.transactions/AccountEntity.java b/sql-db/narayana-transactions/src/main/java/io.quarkus.ts.transactions/AccountEntity.java index f1368e2bce..93debe5e9e 100644 --- a/sql-db/narayana-transactions/src/main/java/io.quarkus.ts.transactions/AccountEntity.java +++ b/sql-db/narayana-transactions/src/main/java/io.quarkus.ts.transactions/AccountEntity.java @@ -4,8 +4,8 @@ import java.util.List; import java.util.Objects; -import javax.persistence.Column; -import javax.persistence.Entity; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; import io.quarkus.hibernate.orm.panache.PanacheEntity; import io.quarkus.panache.common.Parameters; diff --git a/sql-db/narayana-transactions/src/main/java/io.quarkus.ts.transactions/AccountService.java b/sql-db/narayana-transactions/src/main/java/io.quarkus.ts.transactions/AccountService.java index bd9aa13e2a..50e187bd1c 100644 --- a/sql-db/narayana-transactions/src/main/java/io.quarkus.ts.transactions/AccountService.java +++ b/sql-db/narayana-transactions/src/main/java/io.quarkus.ts.transactions/AccountService.java @@ -4,9 +4,9 @@ import java.util.List; -import javax.enterprise.context.ApplicationScoped; -import javax.ws.rs.BadRequestException; -import javax.ws.rs.NotFoundException; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.ws.rs.BadRequestException; +import jakarta.ws.rs.NotFoundException; import org.jboss.logging.Logger; diff --git a/sql-db/narayana-transactions/src/main/java/io.quarkus.ts.transactions/JournalEntity.java b/sql-db/narayana-transactions/src/main/java/io.quarkus.ts.transactions/JournalEntity.java index 1fdd295dd4..c050f20faf 100644 --- a/sql-db/narayana-transactions/src/main/java/io.quarkus.ts.transactions/JournalEntity.java +++ b/sql-db/narayana-transactions/src/main/java/io.quarkus.ts.transactions/JournalEntity.java @@ -2,8 +2,8 @@ import java.sql.Timestamp; -import javax.persistence.Column; -import javax.persistence.Entity; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; import io.quarkus.hibernate.orm.panache.PanacheEntity; import io.quarkus.panache.common.Parameters; diff --git a/sql-db/narayana-transactions/src/main/java/io.quarkus.ts.transactions/JournalService.java b/sql-db/narayana-transactions/src/main/java/io.quarkus.ts.transactions/JournalService.java index 85435720ec..3bd6f112b3 100644 --- a/sql-db/narayana-transactions/src/main/java/io.quarkus.ts.transactions/JournalService.java +++ b/sql-db/narayana-transactions/src/main/java/io.quarkus.ts.transactions/JournalService.java @@ -2,7 +2,7 @@ import static io.quarkus.ts.transactions.JournalEntity.getLatestJournalRecord; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class JournalService { diff --git a/sql-db/narayana-transactions/src/main/java/io.quarkus.ts.transactions/TransferProcessor.java b/sql-db/narayana-transactions/src/main/java/io.quarkus.ts.transactions/TransferProcessor.java index ccb98445c7..3a25d111ae 100644 --- a/sql-db/narayana-transactions/src/main/java/io.quarkus.ts.transactions/TransferProcessor.java +++ b/sql-db/narayana-transactions/src/main/java/io.quarkus.ts.transactions/TransferProcessor.java @@ -1,6 +1,6 @@ package io.quarkus.ts.transactions; -import javax.inject.Inject; +import jakarta.inject.Inject; public abstract class TransferProcessor { diff --git a/sql-db/narayana-transactions/src/main/java/io.quarkus.ts.transactions/TransferResource.java b/sql-db/narayana-transactions/src/main/java/io.quarkus.ts.transactions/TransferResource.java index 589585a8e9..e4a66a0ff2 100644 --- a/sql-db/narayana-transactions/src/main/java/io.quarkus.ts.transactions/TransferResource.java +++ b/sql-db/narayana-transactions/src/main/java/io.quarkus.ts.transactions/TransferResource.java @@ -1,19 +1,19 @@ package io.quarkus.ts.transactions; -import static javax.ws.rs.core.Response.Status.CREATED; +import static jakarta.ws.rs.core.Response.Status.CREATED; import java.util.List; -import javax.inject.Inject; -import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.inject.Inject; +import jakarta.inject.Named; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; @Consumes(MediaType.APPLICATION_JSON) @Produces(MediaType.APPLICATION_JSON) diff --git a/sql-db/narayana-transactions/src/main/java/io.quarkus.ts.transactions/TransferTopUpService.java b/sql-db/narayana-transactions/src/main/java/io.quarkus.ts.transactions/TransferTopUpService.java index 0a2f6be5ee..b967b2adda 100644 --- a/sql-db/narayana-transactions/src/main/java/io.quarkus.ts.transactions/TransferTopUpService.java +++ b/sql-db/narayana-transactions/src/main/java/io.quarkus.ts.transactions/TransferTopUpService.java @@ -1,7 +1,7 @@ package io.quarkus.ts.transactions; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Named; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Named; import org.jboss.logging.Logger; diff --git a/sql-db/narayana-transactions/src/main/java/io.quarkus.ts.transactions/TransferTransactionService.java b/sql-db/narayana-transactions/src/main/java/io.quarkus.ts.transactions/TransferTransactionService.java index 25bcc01109..69efe16691 100644 --- a/sql-db/narayana-transactions/src/main/java/io.quarkus.ts.transactions/TransferTransactionService.java +++ b/sql-db/narayana-transactions/src/main/java/io.quarkus.ts.transactions/TransferTransactionService.java @@ -1,7 +1,7 @@ package io.quarkus.ts.transactions; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Named; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Named; import org.jboss.logging.Logger; diff --git a/sql-db/narayana-transactions/src/main/java/io.quarkus.ts.transactions/TransferWithdrawalService.java b/sql-db/narayana-transactions/src/main/java/io.quarkus.ts.transactions/TransferWithdrawalService.java index f3332a3125..bd1778c942 100644 --- a/sql-db/narayana-transactions/src/main/java/io.quarkus.ts.transactions/TransferWithdrawalService.java +++ b/sql-db/narayana-transactions/src/main/java/io.quarkus.ts.transactions/TransferWithdrawalService.java @@ -1,7 +1,7 @@ package io.quarkus.ts.transactions; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Named; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Named; import org.jboss.logging.Logger; diff --git a/sql-db/panache-flyway/src/main/java/io/quarkus/ts/sqldb/panacheflyway/ApplicationEntity.java b/sql-db/panache-flyway/src/main/java/io/quarkus/ts/sqldb/panacheflyway/ApplicationEntity.java index 03a7373e91..edfcb638d3 100644 --- a/sql-db/panache-flyway/src/main/java/io/quarkus/ts/sqldb/panacheflyway/ApplicationEntity.java +++ b/sql-db/panache-flyway/src/main/java/io/quarkus/ts/sqldb/panacheflyway/ApplicationEntity.java @@ -4,18 +4,18 @@ import java.util.List; import java.util.Optional; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Transient; -import javax.validation.constraints.NotEmpty; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Transient; +import jakarta.validation.constraints.NotEmpty; import org.hibernate.annotations.Filter; import org.hibernate.annotations.FilterDef; diff --git a/sql-db/panache-flyway/src/main/java/io/quarkus/ts/sqldb/panacheflyway/ApplicationQueryResource.java b/sql-db/panache-flyway/src/main/java/io/quarkus/ts/sqldb/panacheflyway/ApplicationQueryResource.java index 02336cf718..873b9469cd 100644 --- a/sql-db/panache-flyway/src/main/java/io/quarkus/ts/sqldb/panacheflyway/ApplicationQueryResource.java +++ b/sql-db/panache-flyway/src/main/java/io/quarkus/ts/sqldb/panacheflyway/ApplicationQueryResource.java @@ -6,14 +6,14 @@ import java.util.Map.Entry; import java.util.stream.Collectors; -import javax.transaction.Transactional; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.UriInfo; +import jakarta.transaction.Transactional; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.UriInfo; import io.quarkus.hibernate.orm.panache.PanacheQuery; diff --git a/sql-db/panache-flyway/src/main/java/io/quarkus/ts/sqldb/panacheflyway/DataSourceResource.java b/sql-db/panache-flyway/src/main/java/io/quarkus/ts/sqldb/panacheflyway/DataSourceResource.java index 3fcfb84ef1..4f42954991 100644 --- a/sql-db/panache-flyway/src/main/java/io/quarkus/ts/sqldb/panacheflyway/DataSourceResource.java +++ b/sql-db/panache-flyway/src/main/java/io/quarkus/ts/sqldb/panacheflyway/DataSourceResource.java @@ -1,9 +1,9 @@ package io.quarkus.ts.sqldb.panacheflyway; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import io.agroal.api.AgroalDataSource; import io.quarkus.agroal.DataSource; diff --git a/sql-db/panache-flyway/src/main/java/io/quarkus/ts/sqldb/panacheflyway/ServiceEntity.java b/sql-db/panache-flyway/src/main/java/io/quarkus/ts/sqldb/panacheflyway/ServiceEntity.java index fdeeac954b..5b57b60ab2 100644 --- a/sql-db/panache-flyway/src/main/java/io/quarkus/ts/sqldb/panacheflyway/ServiceEntity.java +++ b/sql-db/panache-flyway/src/main/java/io/quarkus/ts/sqldb/panacheflyway/ServiceEntity.java @@ -1,12 +1,12 @@ package io.quarkus.ts.sqldb.panacheflyway; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; import com.fasterxml.jackson.annotation.JsonBackReference; diff --git a/sql-db/panache-flyway/src/main/java/io/quarkus/ts/sqldb/panacheflyway/UserEntity.java b/sql-db/panache-flyway/src/main/java/io/quarkus/ts/sqldb/panacheflyway/UserEntity.java index 4b26807f7f..646d043230 100644 --- a/sql-db/panache-flyway/src/main/java/io/quarkus/ts/sqldb/panacheflyway/UserEntity.java +++ b/sql-db/panache-flyway/src/main/java/io/quarkus/ts/sqldb/panacheflyway/UserEntity.java @@ -1,9 +1,9 @@ package io.quarkus.ts.sqldb.panacheflyway; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; @Entity(name = "user_entity") public class UserEntity { diff --git a/sql-db/panache-flyway/src/main/java/io/quarkus/ts/sqldb/panacheflyway/UserRepository.java b/sql-db/panache-flyway/src/main/java/io/quarkus/ts/sqldb/panacheflyway/UserRepository.java index 3d0b0e431f..3ada4e5b81 100644 --- a/sql-db/panache-flyway/src/main/java/io/quarkus/ts/sqldb/panacheflyway/UserRepository.java +++ b/sql-db/panache-flyway/src/main/java/io/quarkus/ts/sqldb/panacheflyway/UserRepository.java @@ -2,7 +2,7 @@ import java.util.Map; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import io.quarkus.hibernate.orm.panache.PanacheQuery; import io.quarkus.hibernate.orm.panache.PanacheRepositoryBase; diff --git a/sql-db/panache-flyway/src/main/java/io/quarkus/ts/sqldb/panacheflyway/VersionEntity.java b/sql-db/panache-flyway/src/main/java/io/quarkus/ts/sqldb/panacheflyway/VersionEntity.java index 2bbfe25e2b..c424136eb9 100644 --- a/sql-db/panache-flyway/src/main/java/io/quarkus/ts/sqldb/panacheflyway/VersionEntity.java +++ b/sql-db/panache-flyway/src/main/java/io/quarkus/ts/sqldb/panacheflyway/VersionEntity.java @@ -1,7 +1,7 @@ package io.quarkus.ts.sqldb.panacheflyway; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import io.quarkus.hibernate.orm.panache.PanacheEntityBase; diff --git a/sql-db/panache-flyway/src/main/java/io/quarkus/ts/sqldb/panacheflyway/secured/EntityDenyAllResource.java b/sql-db/panache-flyway/src/main/java/io/quarkus/ts/sqldb/panacheflyway/secured/EntityDenyAllResource.java index 2e9becb26c..dd243ebaf4 100644 --- a/sql-db/panache-flyway/src/main/java/io/quarkus/ts/sqldb/panacheflyway/secured/EntityDenyAllResource.java +++ b/sql-db/panache-flyway/src/main/java/io/quarkus/ts/sqldb/panacheflyway/secured/EntityDenyAllResource.java @@ -2,9 +2,9 @@ import java.util.List; -import javax.annotation.security.DenyAll; -import javax.annotation.security.PermitAll; -import javax.annotation.security.RolesAllowed; +import jakarta.annotation.security.DenyAll; +import jakarta.annotation.security.PermitAll; +import jakarta.annotation.security.RolesAllowed; import io.quarkus.hibernate.orm.rest.data.panache.PanacheEntityResource; import io.quarkus.panache.common.Page; diff --git a/sql-db/panache-flyway/src/main/java/io/quarkus/ts/sqldb/panacheflyway/secured/EntityPermitAllResource.java b/sql-db/panache-flyway/src/main/java/io/quarkus/ts/sqldb/panacheflyway/secured/EntityPermitAllResource.java index 3806acd616..dead908c57 100644 --- a/sql-db/panache-flyway/src/main/java/io/quarkus/ts/sqldb/panacheflyway/secured/EntityPermitAllResource.java +++ b/sql-db/panache-flyway/src/main/java/io/quarkus/ts/sqldb/panacheflyway/secured/EntityPermitAllResource.java @@ -1,7 +1,7 @@ package io.quarkus.ts.sqldb.panacheflyway.secured; -import javax.annotation.security.DenyAll; -import javax.annotation.security.PermitAll; +import jakarta.annotation.security.DenyAll; +import jakarta.annotation.security.PermitAll; import io.quarkus.hibernate.orm.rest.data.panache.PanacheEntityResource; import io.quarkus.rest.data.panache.ResourceProperties; diff --git a/sql-db/panache-flyway/src/main/java/io/quarkus/ts/sqldb/panacheflyway/secured/EntityPublicResource.java b/sql-db/panache-flyway/src/main/java/io/quarkus/ts/sqldb/panacheflyway/secured/EntityPublicResource.java index 9dbf396410..f7483c27fe 100644 --- a/sql-db/panache-flyway/src/main/java/io/quarkus/ts/sqldb/panacheflyway/secured/EntityPublicResource.java +++ b/sql-db/panache-flyway/src/main/java/io/quarkus/ts/sqldb/panacheflyway/secured/EntityPublicResource.java @@ -1,6 +1,6 @@ package io.quarkus.ts.sqldb.panacheflyway.secured; -import javax.annotation.security.DenyAll; +import jakarta.annotation.security.DenyAll; import io.quarkus.hibernate.orm.rest.data.panache.PanacheEntityResource; import io.quarkus.rest.data.panache.ResourceProperties; diff --git a/sql-db/panache-flyway/src/main/java/io/quarkus/ts/sqldb/panacheflyway/secured/EntityRolesAllowedResource.java b/sql-db/panache-flyway/src/main/java/io/quarkus/ts/sqldb/panacheflyway/secured/EntityRolesAllowedResource.java index d0141681f1..d451bdddcc 100644 --- a/sql-db/panache-flyway/src/main/java/io/quarkus/ts/sqldb/panacheflyway/secured/EntityRolesAllowedResource.java +++ b/sql-db/panache-flyway/src/main/java/io/quarkus/ts/sqldb/panacheflyway/secured/EntityRolesAllowedResource.java @@ -1,6 +1,6 @@ package io.quarkus.ts.sqldb.panacheflyway.secured; -import javax.annotation.security.RolesAllowed; +import jakarta.annotation.security.RolesAllowed; import io.quarkus.hibernate.orm.rest.data.panache.PanacheEntityResource; import io.quarkus.rest.data.panache.ResourceProperties; diff --git a/sql-db/panache-flyway/src/main/java/io/quarkus/ts/sqldb/panacheflyway/secured/RepositoryDenyAllResource.java b/sql-db/panache-flyway/src/main/java/io/quarkus/ts/sqldb/panacheflyway/secured/RepositoryDenyAllResource.java index ee2256d194..b7794c02e7 100644 --- a/sql-db/panache-flyway/src/main/java/io/quarkus/ts/sqldb/panacheflyway/secured/RepositoryDenyAllResource.java +++ b/sql-db/panache-flyway/src/main/java/io/quarkus/ts/sqldb/panacheflyway/secured/RepositoryDenyAllResource.java @@ -2,9 +2,9 @@ import java.util.List; -import javax.annotation.security.DenyAll; -import javax.annotation.security.PermitAll; -import javax.annotation.security.RolesAllowed; +import jakarta.annotation.security.DenyAll; +import jakarta.annotation.security.PermitAll; +import jakarta.annotation.security.RolesAllowed; import io.quarkus.hibernate.orm.rest.data.panache.PanacheRepositoryResource; import io.quarkus.panache.common.Page; diff --git a/sql-db/panache-flyway/src/main/java/io/quarkus/ts/sqldb/panacheflyway/secured/RepositoryPermitAllResource.java b/sql-db/panache-flyway/src/main/java/io/quarkus/ts/sqldb/panacheflyway/secured/RepositoryPermitAllResource.java index 6cd3dbd932..7136738d6e 100644 --- a/sql-db/panache-flyway/src/main/java/io/quarkus/ts/sqldb/panacheflyway/secured/RepositoryPermitAllResource.java +++ b/sql-db/panache-flyway/src/main/java/io/quarkus/ts/sqldb/panacheflyway/secured/RepositoryPermitAllResource.java @@ -1,7 +1,7 @@ package io.quarkus.ts.sqldb.panacheflyway.secured; -import javax.annotation.security.DenyAll; -import javax.annotation.security.PermitAll; +import jakarta.annotation.security.DenyAll; +import jakarta.annotation.security.PermitAll; import io.quarkus.hibernate.orm.rest.data.panache.PanacheRepositoryResource; import io.quarkus.rest.data.panache.ResourceProperties; diff --git a/sql-db/panache-flyway/src/main/java/io/quarkus/ts/sqldb/panacheflyway/secured/RepositoryPublicResource.java b/sql-db/panache-flyway/src/main/java/io/quarkus/ts/sqldb/panacheflyway/secured/RepositoryPublicResource.java index c88bd054db..b8ed7e0ddb 100644 --- a/sql-db/panache-flyway/src/main/java/io/quarkus/ts/sqldb/panacheflyway/secured/RepositoryPublicResource.java +++ b/sql-db/panache-flyway/src/main/java/io/quarkus/ts/sqldb/panacheflyway/secured/RepositoryPublicResource.java @@ -1,6 +1,6 @@ package io.quarkus.ts.sqldb.panacheflyway.secured; -import javax.annotation.security.DenyAll; +import jakarta.annotation.security.DenyAll; import io.quarkus.hibernate.orm.rest.data.panache.PanacheRepositoryResource; import io.quarkus.rest.data.panache.ResourceProperties; diff --git a/sql-db/panache-flyway/src/main/java/io/quarkus/ts/sqldb/panacheflyway/secured/RepositoryRolesAllowedResource.java b/sql-db/panache-flyway/src/main/java/io/quarkus/ts/sqldb/panacheflyway/secured/RepositoryRolesAllowedResource.java index a2c0da618c..df9a0bd079 100644 --- a/sql-db/panache-flyway/src/main/java/io/quarkus/ts/sqldb/panacheflyway/secured/RepositoryRolesAllowedResource.java +++ b/sql-db/panache-flyway/src/main/java/io/quarkus/ts/sqldb/panacheflyway/secured/RepositoryRolesAllowedResource.java @@ -1,6 +1,6 @@ package io.quarkus.ts.sqldb.panacheflyway.secured; -import javax.annotation.security.RolesAllowed; +import jakarta.annotation.security.RolesAllowed; import io.quarkus.hibernate.orm.rest.data.panache.PanacheRepositoryResource; import io.quarkus.rest.data.panache.ResourceProperties; diff --git a/sql-db/panache-flyway/src/test/java/io/quarkus/ts/sqldb/panacheflyway/CRUDPanacheWithFlywayIT.java b/sql-db/panache-flyway/src/test/java/io/quarkus/ts/sqldb/panacheflyway/CRUDPanacheWithFlywayIT.java index cf47081c7f..30b6f789a4 100644 --- a/sql-db/panache-flyway/src/test/java/io/quarkus/ts/sqldb/panacheflyway/CRUDPanacheWithFlywayIT.java +++ b/sql-db/panache-flyway/src/test/java/io/quarkus/ts/sqldb/panacheflyway/CRUDPanacheWithFlywayIT.java @@ -12,7 +12,7 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import org.apache.http.HttpStatus; import org.junit.jupiter.api.AfterEach; diff --git a/sql-db/panache-flyway/src/test/java/io/quarkus/ts/sqldb/panacheflyway/dbpool/AgroalPoolTest.java b/sql-db/panache-flyway/src/test/java/io/quarkus/ts/sqldb/panacheflyway/dbpool/AgroalPoolTest.java index 46c0241a87..a28e5909bb 100644 --- a/sql-db/panache-flyway/src/test/java/io/quarkus/ts/sqldb/panacheflyway/dbpool/AgroalPoolTest.java +++ b/sql-db/panache-flyway/src/test/java/io/quarkus/ts/sqldb/panacheflyway/dbpool/AgroalPoolTest.java @@ -13,9 +13,9 @@ import java.time.Duration; import java.util.concurrent.atomic.AtomicInteger; -import javax.inject.Inject; -import javax.persistence.EntityManager; -import javax.persistence.Query; +import jakarta.inject.Inject; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Query; import org.apache.http.HttpStatus; import org.eclipse.microprofile.config.inject.ConfigProperty; diff --git a/sql-db/reactive-rest-data-panache/src/main/java/io/quarkus/ts/reactive/rest/data/panache/ApplicationEntity.java b/sql-db/reactive-rest-data-panache/src/main/java/io/quarkus/ts/reactive/rest/data/panache/ApplicationEntity.java index 32c4c68d90..7fa3600771 100644 --- a/sql-db/reactive-rest-data-panache/src/main/java/io/quarkus/ts/reactive/rest/data/panache/ApplicationEntity.java +++ b/sql-db/reactive-rest-data-panache/src/main/java/io/quarkus/ts/reactive/rest/data/panache/ApplicationEntity.java @@ -4,18 +4,18 @@ import java.util.List; import java.util.Optional; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Transient; -import javax.validation.constraints.NotEmpty; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Transient; +import jakarta.validation.constraints.NotEmpty; import org.hibernate.annotations.Filter; import org.hibernate.annotations.FilterDef; diff --git a/sql-db/reactive-rest-data-panache/src/main/java/io/quarkus/ts/reactive/rest/data/panache/ApplicationQueryResource.java b/sql-db/reactive-rest-data-panache/src/main/java/io/quarkus/ts/reactive/rest/data/panache/ApplicationQueryResource.java index f48bde5c9f..fa822941f6 100644 --- a/sql-db/reactive-rest-data-panache/src/main/java/io/quarkus/ts/reactive/rest/data/panache/ApplicationQueryResource.java +++ b/sql-db/reactive-rest-data-panache/src/main/java/io/quarkus/ts/reactive/rest/data/panache/ApplicationQueryResource.java @@ -6,14 +6,14 @@ import java.util.Map.Entry; import java.util.stream.Collectors; -import javax.transaction.Transactional; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.UriInfo; +import jakarta.transaction.Transactional; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.UriInfo; import io.quarkus.hibernate.orm.panache.PanacheQuery; diff --git a/sql-db/reactive-rest-data-panache/src/main/java/io/quarkus/ts/reactive/rest/data/panache/ServiceEntity.java b/sql-db/reactive-rest-data-panache/src/main/java/io/quarkus/ts/reactive/rest/data/panache/ServiceEntity.java index 8ee832f314..1dcef48921 100644 --- a/sql-db/reactive-rest-data-panache/src/main/java/io/quarkus/ts/reactive/rest/data/panache/ServiceEntity.java +++ b/sql-db/reactive-rest-data-panache/src/main/java/io/quarkus/ts/reactive/rest/data/panache/ServiceEntity.java @@ -1,12 +1,12 @@ package io.quarkus.ts.reactive.rest.data.panache; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; import com.fasterxml.jackson.annotation.JsonBackReference; diff --git a/sql-db/reactive-rest-data-panache/src/main/java/io/quarkus/ts/reactive/rest/data/panache/UserEntity.java b/sql-db/reactive-rest-data-panache/src/main/java/io/quarkus/ts/reactive/rest/data/panache/UserEntity.java index 28c84e22bd..1296d43f8d 100644 --- a/sql-db/reactive-rest-data-panache/src/main/java/io/quarkus/ts/reactive/rest/data/panache/UserEntity.java +++ b/sql-db/reactive-rest-data-panache/src/main/java/io/quarkus/ts/reactive/rest/data/panache/UserEntity.java @@ -1,9 +1,9 @@ package io.quarkus.ts.reactive.rest.data.panache; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; @Entity(name = "user_entity") public class UserEntity { diff --git a/sql-db/reactive-rest-data-panache/src/main/java/io/quarkus/ts/reactive/rest/data/panache/UserRepository.java b/sql-db/reactive-rest-data-panache/src/main/java/io/quarkus/ts/reactive/rest/data/panache/UserRepository.java index 0cedc9bda4..51716bf141 100644 --- a/sql-db/reactive-rest-data-panache/src/main/java/io/quarkus/ts/reactive/rest/data/panache/UserRepository.java +++ b/sql-db/reactive-rest-data-panache/src/main/java/io/quarkus/ts/reactive/rest/data/panache/UserRepository.java @@ -2,7 +2,7 @@ import java.util.Map; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import io.quarkus.hibernate.orm.panache.PanacheQuery; import io.quarkus.hibernate.orm.panache.PanacheRepositoryBase; diff --git a/sql-db/reactive-rest-data-panache/src/main/java/io/quarkus/ts/reactive/rest/data/panache/VersionEntity.java b/sql-db/reactive-rest-data-panache/src/main/java/io/quarkus/ts/reactive/rest/data/panache/VersionEntity.java index 7dfe3fddf6..a1e4865c31 100644 --- a/sql-db/reactive-rest-data-panache/src/main/java/io/quarkus/ts/reactive/rest/data/panache/VersionEntity.java +++ b/sql-db/reactive-rest-data-panache/src/main/java/io/quarkus/ts/reactive/rest/data/panache/VersionEntity.java @@ -1,7 +1,7 @@ package io.quarkus.ts.reactive.rest.data.panache; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import io.quarkus.hibernate.orm.panache.PanacheEntityBase; diff --git a/sql-db/reactive-rest-data-panache/src/test/java/io/quarkus/ts/reactive/rest/data/panache/AbstractPanacheResourceIT.java b/sql-db/reactive-rest-data-panache/src/test/java/io/quarkus/ts/reactive/rest/data/panache/AbstractPanacheResourceIT.java index 9438249605..dfb05b6e7c 100644 --- a/sql-db/reactive-rest-data-panache/src/test/java/io/quarkus/ts/reactive/rest/data/panache/AbstractPanacheResourceIT.java +++ b/sql-db/reactive-rest-data-panache/src/test/java/io/quarkus/ts/reactive/rest/data/panache/AbstractPanacheResourceIT.java @@ -14,7 +14,7 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import org.apache.http.HttpStatus; import org.hamcrest.CoreMatchers; diff --git a/sql-db/reactive-vanilla/src/main/java/io/quarkus/ts/reactive/db/clients/CommonResource.java b/sql-db/reactive-vanilla/src/main/java/io/quarkus/ts/reactive/db/clients/CommonResource.java index cbd3c44a38..11b604833f 100644 --- a/sql-db/reactive-vanilla/src/main/java/io/quarkus/ts/reactive/db/clients/CommonResource.java +++ b/sql-db/reactive-vanilla/src/main/java/io/quarkus/ts/reactive/db/clients/CommonResource.java @@ -2,7 +2,7 @@ import java.net.URI; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.core.UriInfo; import org.jboss.logging.Logger; diff --git a/sql-db/reactive-vanilla/src/main/java/io/quarkus/ts/reactive/db/clients/HardCoverBookResource.java b/sql-db/reactive-vanilla/src/main/java/io/quarkus/ts/reactive/db/clients/HardCoverBookResource.java index 82e50698e9..f64a25ed4e 100644 --- a/sql-db/reactive-vanilla/src/main/java/io/quarkus/ts/reactive/db/clients/HardCoverBookResource.java +++ b/sql-db/reactive-vanilla/src/main/java/io/quarkus/ts/reactive/db/clients/HardCoverBookResource.java @@ -1,17 +1,17 @@ package io.quarkus.ts.reactive.db.clients; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; -import javax.enterprise.event.Observes; -import javax.inject.Inject; -import javax.inject.Named; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriInfo; +import jakarta.enterprise.event.Observes; +import jakarta.inject.Inject; +import jakarta.inject.Named; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriInfo; import org.jboss.logging.Logger; diff --git a/sql-db/reactive-vanilla/src/main/java/io/quarkus/ts/reactive/db/clients/NoteBookResource.java b/sql-db/reactive-vanilla/src/main/java/io/quarkus/ts/reactive/db/clients/NoteBookResource.java index ad129a33cb..221355d624 100644 --- a/sql-db/reactive-vanilla/src/main/java/io/quarkus/ts/reactive/db/clients/NoteBookResource.java +++ b/sql-db/reactive-vanilla/src/main/java/io/quarkus/ts/reactive/db/clients/NoteBookResource.java @@ -1,17 +1,17 @@ package io.quarkus.ts.reactive.db.clients; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; - -import javax.enterprise.event.Observes; -import javax.inject.Inject; -import javax.inject.Named; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriInfo; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; + +import jakarta.enterprise.event.Observes; +import jakarta.inject.Inject; +import jakarta.inject.Named; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriInfo; import org.jboss.logging.Logger; diff --git a/sql-db/reactive-vanilla/src/main/java/io/quarkus/ts/reactive/db/clients/SoftCoverBookResource.java b/sql-db/reactive-vanilla/src/main/java/io/quarkus/ts/reactive/db/clients/SoftCoverBookResource.java index 603fb09406..5198d7a2da 100644 --- a/sql-db/reactive-vanilla/src/main/java/io/quarkus/ts/reactive/db/clients/SoftCoverBookResource.java +++ b/sql-db/reactive-vanilla/src/main/java/io/quarkus/ts/reactive/db/clients/SoftCoverBookResource.java @@ -1,16 +1,16 @@ package io.quarkus.ts.reactive.db.clients; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; - -import javax.enterprise.event.Observes; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriInfo; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; + +import jakarta.enterprise.event.Observes; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriInfo; import org.jboss.logging.Logger; diff --git a/sql-db/reactive-vanilla/src/test/java/io/quarkus/ts/reactive/db/clients/DevModeMultipleReactiveSqlClientsIT.java b/sql-db/reactive-vanilla/src/test/java/io/quarkus/ts/reactive/db/clients/DevModeMultipleReactiveSqlClientsIT.java index bc908e481f..33ce24b8eb 100644 --- a/sql-db/reactive-vanilla/src/test/java/io/quarkus/ts/reactive/db/clients/DevModeMultipleReactiveSqlClientsIT.java +++ b/sql-db/reactive-vanilla/src/test/java/io/quarkus/ts/reactive/db/clients/DevModeMultipleReactiveSqlClientsIT.java @@ -5,7 +5,7 @@ import static org.hamcrest.Matchers.greaterThan; import static org.hamcrest.Matchers.not; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import org.apache.http.HttpStatus; import org.junit.jupiter.api.Tag; diff --git a/sql-db/sql-app/src/main/java/io/quarkus/ts/sqldb/sqlapp/ApplicationExceptionMapper.java b/sql-db/sql-app/src/main/java/io/quarkus/ts/sqldb/sqlapp/ApplicationExceptionMapper.java index 607b9794ad..419f4b8b6c 100644 --- a/sql-db/sql-app/src/main/java/io/quarkus/ts/sqldb/sqlapp/ApplicationExceptionMapper.java +++ b/sql-db/sql-app/src/main/java/io/quarkus/ts/sqldb/sqlapp/ApplicationExceptionMapper.java @@ -1,10 +1,10 @@ package io.quarkus.ts.sqldb.sqlapp; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.ExceptionMapper; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.ExceptionMapper; +import jakarta.ws.rs.ext.Provider; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/sql-db/sql-app/src/main/java/io/quarkus/ts/sqldb/sqlapp/Book.java b/sql-db/sql-app/src/main/java/io/quarkus/ts/sqldb/sqlapp/Book.java index faeebcd749..566ae78f7c 100644 --- a/sql-db/sql-app/src/main/java/io/quarkus/ts/sqldb/sqlapp/Book.java +++ b/sql-db/sql-app/src/main/java/io/quarkus/ts/sqldb/sqlapp/Book.java @@ -1,8 +1,8 @@ package io.quarkus.ts.sqldb.sqlapp; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.validation.constraints.NotBlank; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; +import jakarta.validation.constraints.NotBlank; import io.quarkus.hibernate.orm.panache.PanacheEntity; diff --git a/sql-db/sql-app/src/main/java/io/quarkus/ts/sqldb/sqlapp/BookResource.java b/sql-db/sql-app/src/main/java/io/quarkus/ts/sqldb/sqlapp/BookResource.java index 23050c6b17..669ba8e3e0 100644 --- a/sql-db/sql-app/src/main/java/io/quarkus/ts/sqldb/sqlapp/BookResource.java +++ b/sql-db/sql-app/src/main/java/io/quarkus/ts/sqldb/sqlapp/BookResource.java @@ -2,20 +2,20 @@ import java.util.List; -import javax.transaction.Transactional; -import javax.validation.Valid; -import javax.ws.rs.ClientErrorException; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.NotFoundException; -import javax.ws.rs.POST; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.transaction.Transactional; +import jakarta.validation.Valid; +import jakarta.ws.rs.ClientErrorException; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import io.quarkus.panache.common.Sort; diff --git a/sql-db/sql-app/src/main/java/io/quarkus/ts/sqldb/sqlapp/NotFoundExceptionMapper.java b/sql-db/sql-app/src/main/java/io/quarkus/ts/sqldb/sqlapp/NotFoundExceptionMapper.java index dfe4a792da..820b5381b9 100644 --- a/sql-db/sql-app/src/main/java/io/quarkus/ts/sqldb/sqlapp/NotFoundExceptionMapper.java +++ b/sql-db/sql-app/src/main/java/io/quarkus/ts/sqldb/sqlapp/NotFoundExceptionMapper.java @@ -1,9 +1,9 @@ package io.quarkus.ts.sqldb.sqlapp; -import javax.ws.rs.NotFoundException; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.ExceptionMapper; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.ExceptionMapper; +import jakarta.ws.rs.ext.Provider; // workaround for Quarkus providing its own NotFoundExceptionMapper // which is more specific than our ApplicationExceptionMapper diff --git a/sql-db/sql-app/src/main/java/io/quarkus/ts/sqldb/sqlapp/ValidationExceptionMapper.java b/sql-db/sql-app/src/main/java/io/quarkus/ts/sqldb/sqlapp/ValidationExceptionMapper.java index c34c5ec292..5147cdc981 100644 --- a/sql-db/sql-app/src/main/java/io/quarkus/ts/sqldb/sqlapp/ValidationExceptionMapper.java +++ b/sql-db/sql-app/src/main/java/io/quarkus/ts/sqldb/sqlapp/ValidationExceptionMapper.java @@ -1,11 +1,11 @@ package io.quarkus.ts.sqldb.sqlapp; -import javax.validation.ConstraintViolation; -import javax.validation.ConstraintViolationException; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.ExceptionMapper; -import javax.ws.rs.ext.Provider; +import jakarta.validation.ConstraintViolation; +import jakarta.validation.ConstraintViolationException; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.ExceptionMapper; +import jakarta.ws.rs.ext.Provider; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ArrayNode; diff --git a/sql-db/vertx-sql/src/main/java/io/quarkus/ts/vertx/sql/Application.java b/sql-db/vertx-sql/src/main/java/io/quarkus/ts/vertx/sql/Application.java index a1a5778217..a70045b3ea 100644 --- a/sql-db/vertx-sql/src/main/java/io/quarkus/ts/vertx/sql/Application.java +++ b/sql-db/vertx-sql/src/main/java/io/quarkus/ts/vertx/sql/Application.java @@ -2,12 +2,12 @@ import static com.fasterxml.jackson.annotation.JsonInclude.Include; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.event.Observes; -import javax.enterprise.inject.Produces; -import javax.inject.Inject; -import javax.inject.Named; -import javax.inject.Singleton; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.event.Observes; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Inject; +import jakarta.inject.Named; +import jakarta.inject.Singleton; import org.eclipse.microprofile.config.inject.ConfigProperty; diff --git a/sql-db/vertx-sql/src/main/java/io/quarkus/ts/vertx/sql/domain/QueryFlightSearch.java b/sql-db/vertx-sql/src/main/java/io/quarkus/ts/vertx/sql/domain/QueryFlightSearch.java index ca62cadf13..21044e91ac 100644 --- a/sql-db/vertx-sql/src/main/java/io/quarkus/ts/vertx/sql/domain/QueryFlightSearch.java +++ b/sql-db/vertx-sql/src/main/java/io/quarkus/ts/vertx/sql/domain/QueryFlightSearch.java @@ -2,8 +2,8 @@ import java.util.Objects; -import javax.validation.constraints.Min; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotNull; import io.vertx.core.json.Json; diff --git a/sql-db/vertx-sql/src/main/java/io/quarkus/ts/vertx/sql/handlers/AirlineHandler.java b/sql-db/vertx-sql/src/main/java/io/quarkus/ts/vertx/sql/handlers/AirlineHandler.java index 336d9ef25c..3ebff9b550 100644 --- a/sql-db/vertx-sql/src/main/java/io/quarkus/ts/vertx/sql/handlers/AirlineHandler.java +++ b/sql-db/vertx-sql/src/main/java/io/quarkus/ts/vertx/sql/handlers/AirlineHandler.java @@ -1,8 +1,8 @@ package io.quarkus.ts.vertx.sql.handlers; -import javax.inject.Inject; -import javax.inject.Named; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Named; +import jakarta.inject.Singleton; import org.eclipse.microprofile.openapi.annotations.Operation; import org.eclipse.microprofile.openapi.annotations.enums.SchemaType; diff --git a/sql-db/vertx-sql/src/main/java/io/quarkus/ts/vertx/sql/handlers/AirportsHandler.java b/sql-db/vertx-sql/src/main/java/io/quarkus/ts/vertx/sql/handlers/AirportsHandler.java index 5173601609..85f2c789e6 100644 --- a/sql-db/vertx-sql/src/main/java/io/quarkus/ts/vertx/sql/handlers/AirportsHandler.java +++ b/sql-db/vertx-sql/src/main/java/io/quarkus/ts/vertx/sql/handlers/AirportsHandler.java @@ -1,8 +1,8 @@ package io.quarkus.ts.vertx.sql.handlers; -import javax.inject.Inject; -import javax.inject.Named; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Named; +import jakarta.inject.Singleton; import org.eclipse.microprofile.openapi.annotations.Operation; import org.eclipse.microprofile.openapi.annotations.enums.SchemaType; diff --git a/sql-db/vertx-sql/src/main/java/io/quarkus/ts/vertx/sql/handlers/BasketHandler.java b/sql-db/vertx-sql/src/main/java/io/quarkus/ts/vertx/sql/handlers/BasketHandler.java index 60e2cf51c7..1fb357b64a 100644 --- a/sql-db/vertx-sql/src/main/java/io/quarkus/ts/vertx/sql/handlers/BasketHandler.java +++ b/sql-db/vertx-sql/src/main/java/io/quarkus/ts/vertx/sql/handlers/BasketHandler.java @@ -1,8 +1,8 @@ package io.quarkus.ts.vertx.sql.handlers; -import javax.inject.Inject; -import javax.inject.Named; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Named; +import jakarta.inject.Singleton; import org.eclipse.microprofile.openapi.annotations.Operation; import org.eclipse.microprofile.openapi.annotations.enums.SchemaType; diff --git a/sql-db/vertx-sql/src/main/java/io/quarkus/ts/vertx/sql/handlers/FailureHandler.java b/sql-db/vertx-sql/src/main/java/io/quarkus/ts/vertx/sql/handlers/FailureHandler.java index 55d827b4b8..be3262db14 100644 --- a/sql-db/vertx-sql/src/main/java/io/quarkus/ts/vertx/sql/handlers/FailureHandler.java +++ b/sql-db/vertx-sql/src/main/java/io/quarkus/ts/vertx/sql/handlers/FailureHandler.java @@ -2,8 +2,8 @@ import java.util.stream.Collectors; -import javax.enterprise.context.ApplicationScoped; -import javax.validation.ConstraintViolationException; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.validation.ConstraintViolationException; import io.quarkus.vertx.web.Route; import io.vertx.core.http.HttpServerResponse; diff --git a/sql-db/vertx-sql/src/main/java/io/quarkus/ts/vertx/sql/handlers/FlightsHandler.java b/sql-db/vertx-sql/src/main/java/io/quarkus/ts/vertx/sql/handlers/FlightsHandler.java index 767f432330..19932da1a1 100644 --- a/sql-db/vertx-sql/src/main/java/io/quarkus/ts/vertx/sql/handlers/FlightsHandler.java +++ b/sql-db/vertx-sql/src/main/java/io/quarkus/ts/vertx/sql/handlers/FlightsHandler.java @@ -1,9 +1,9 @@ package io.quarkus.ts.vertx.sql.handlers; -import javax.inject.Inject; -import javax.inject.Named; -import javax.inject.Singleton; -import javax.validation.Valid; +import jakarta.inject.Inject; +import jakarta.inject.Named; +import jakarta.inject.Singleton; +import jakarta.validation.Valid; import org.eclipse.microprofile.openapi.annotations.OpenAPIDefinition; import org.eclipse.microprofile.openapi.annotations.Operation; diff --git a/sql-db/vertx-sql/src/main/java/io/quarkus/ts/vertx/sql/handlers/PricingRulesHandler.java b/sql-db/vertx-sql/src/main/java/io/quarkus/ts/vertx/sql/handlers/PricingRulesHandler.java index c36b63f8e0..775233285e 100644 --- a/sql-db/vertx-sql/src/main/java/io/quarkus/ts/vertx/sql/handlers/PricingRulesHandler.java +++ b/sql-db/vertx-sql/src/main/java/io/quarkus/ts/vertx/sql/handlers/PricingRulesHandler.java @@ -1,8 +1,8 @@ package io.quarkus.ts.vertx.sql.handlers; -import javax.inject.Inject; -import javax.inject.Named; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Named; +import jakarta.inject.Singleton; import org.eclipse.microprofile.openapi.annotations.Operation; import org.eclipse.microprofile.openapi.annotations.enums.SchemaType; diff --git a/sql-db/vertx-sql/src/main/java/io/quarkus/ts/vertx/sql/services/FlightSearchService.java b/sql-db/vertx-sql/src/main/java/io/quarkus/ts/vertx/sql/services/FlightSearchService.java index 1e5d2784d3..a6918bc454 100644 --- a/sql-db/vertx-sql/src/main/java/io/quarkus/ts/vertx/sql/services/FlightSearchService.java +++ b/sql-db/vertx-sql/src/main/java/io/quarkus/ts/vertx/sql/services/FlightSearchService.java @@ -6,10 +6,10 @@ import java.util.List; import java.util.Map; -import javax.enterprise.event.Observes; -import javax.inject.Inject; -import javax.inject.Named; -import javax.inject.Singleton; +import jakarta.enterprise.event.Observes; +import jakarta.inject.Inject; +import jakarta.inject.Named; +import jakarta.inject.Singleton; import io.quarkus.runtime.StartupEvent; import io.quarkus.ts.vertx.sql.domain.Airline; diff --git a/sql-db/vertx-sql/src/test/java/io/quarkus/ts/vertx/sql/dbpool/PostgresPoolTest.java b/sql-db/vertx-sql/src/test/java/io/quarkus/ts/vertx/sql/dbpool/PostgresPoolTest.java index 26f1d013e1..685e02c5a5 100644 --- a/sql-db/vertx-sql/src/test/java/io/quarkus/ts/vertx/sql/dbpool/PostgresPoolTest.java +++ b/sql-db/vertx-sql/src/test/java/io/quarkus/ts/vertx/sql/dbpool/PostgresPoolTest.java @@ -10,7 +10,7 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.http.HttpStatus; import org.eclipse.microprofile.config.inject.ConfigProperty; diff --git a/super-size/many-extensions/README.md b/super-size/many-extensions/README.md index 0908b1ed2c..16b4a14d7b 100644 --- a/super-size/many-extensions/README.md +++ b/super-size/many-extensions/README.md @@ -14,12 +14,12 @@ for name in `project-name-generator -w 59 -o spaced`; do echo "${name} - ${Name}" tee ${SRC_PATH}/Resource${Name}.java << EOF package io.quarkus.ts.many.extensions; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.PathParam; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.PathParam; @Path("/resource/${name}") public class Resource${Name} { @@ -36,7 +36,7 @@ public class Resource${Name} { EOF tee ${SRC_PATH}/Service${Name}.java << EOF package io.quarkus.ts.many.extensions; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class Service${Name} { public String process(String name) { diff --git a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/HelloResource.java b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/HelloResource.java index f6f1bac528..0a27c6992c 100644 --- a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/HelloResource.java +++ b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/HelloResource.java @@ -1,11 +1,11 @@ package io.quarkus.ts.many.extensions; -import javax.ws.rs.DefaultValue; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.DefaultValue; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; @Path("/hello") public class HelloResource { diff --git a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceAdorable.java b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceAdorable.java index 3d4096d3ff..43049e6a8e 100644 --- a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceAdorable.java +++ b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceAdorable.java @@ -1,11 +1,11 @@ package io.quarkus.ts.many.extensions; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; @Path("/resource/adorable") public class ResourceAdorable { diff --git a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceAmbitious.java b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceAmbitious.java index aedae1a32a..72d257cff0 100644 --- a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceAmbitious.java +++ b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceAmbitious.java @@ -1,11 +1,11 @@ package io.quarkus.ts.many.extensions; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; @Path("/resource/ambitious") public class ResourceAmbitious { diff --git a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceAmused.java b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceAmused.java index 5e63b71956..7c38a51909 100644 --- a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceAmused.java +++ b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceAmused.java @@ -1,11 +1,11 @@ package io.quarkus.ts.many.extensions; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; @Path("/resource/amused") public class ResourceAmused { diff --git a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceAquatic.java b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceAquatic.java index 04bf40217f..388febf616 100644 --- a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceAquatic.java +++ b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceAquatic.java @@ -1,11 +1,11 @@ package io.quarkus.ts.many.extensions; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; @Path("/resource/aquatic") public class ResourceAquatic { diff --git a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceAxiomatic.java b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceAxiomatic.java index c0bcd7e789..e4d70f57a7 100644 --- a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceAxiomatic.java +++ b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceAxiomatic.java @@ -1,11 +1,11 @@ package io.quarkus.ts.many.extensions; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; @Path("/resource/axiomatic") public class ResourceAxiomatic { diff --git a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceBustling.java b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceBustling.java index 633004c049..257fdcc851 100644 --- a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceBustling.java +++ b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceBustling.java @@ -1,11 +1,11 @@ package io.quarkus.ts.many.extensions; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; @Path("/resource/bustling") public class ResourceBustling { diff --git a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceCertain.java b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceCertain.java index 9813a1fa93..ed56bd0f44 100644 --- a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceCertain.java +++ b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceCertain.java @@ -1,11 +1,11 @@ package io.quarkus.ts.many.extensions; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; @Path("/resource/certain") public class ResourceCertain { diff --git a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceClammy.java b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceClammy.java index f6cec6c3d0..2580783d96 100644 --- a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceClammy.java +++ b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceClammy.java @@ -1,11 +1,11 @@ package io.quarkus.ts.many.extensions; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; @Path("/resource/clammy") public class ResourceClammy { diff --git a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceDirty.java b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceDirty.java index b2afb6fd99..1df6227309 100644 --- a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceDirty.java +++ b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceDirty.java @@ -1,11 +1,11 @@ package io.quarkus.ts.many.extensions; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; @Path("/resource/dirty") public class ResourceDirty { diff --git a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceDisastrous.java b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceDisastrous.java index f8d4c5656b..50ba7703a0 100644 --- a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceDisastrous.java +++ b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceDisastrous.java @@ -1,11 +1,11 @@ package io.quarkus.ts.many.extensions; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; @Path("/resource/disastrous") public class ResourceDisastrous { diff --git a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceDisgusting.java b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceDisgusting.java index b4c46bed6b..4208da3acd 100644 --- a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceDisgusting.java +++ b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceDisgusting.java @@ -1,11 +1,11 @@ package io.quarkus.ts.many.extensions; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; @Path("/resource/disgusting") public class ResourceDisgusting { diff --git a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceDistinct.java b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceDistinct.java index c74a0a712e..1aaa3daee5 100644 --- a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceDistinct.java +++ b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceDistinct.java @@ -1,11 +1,11 @@ package io.quarkus.ts.many.extensions; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; @Path("/resource/distinct") public class ResourceDistinct { diff --git a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceFalse.java b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceFalse.java index fd943a4080..addb362044 100644 --- a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceFalse.java +++ b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceFalse.java @@ -1,11 +1,11 @@ package io.quarkus.ts.many.extensions; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; @Path("/resource/false") public class ResourceFalse { diff --git a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceFeigned.java b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceFeigned.java index ee37e230a3..d5fb2e9d10 100644 --- a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceFeigned.java +++ b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceFeigned.java @@ -1,11 +1,11 @@ package io.quarkus.ts.many.extensions; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; @Path("/resource/feigned") public class ResourceFeigned { diff --git a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceFlagrant.java b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceFlagrant.java index d492921c53..dc092f2707 100644 --- a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceFlagrant.java +++ b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceFlagrant.java @@ -1,11 +1,11 @@ package io.quarkus.ts.many.extensions; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; @Path("/resource/flagrant") public class ResourceFlagrant { diff --git a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceFor.java b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceFor.java index 5e3318fad2..0164a3dc14 100644 --- a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceFor.java +++ b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceFor.java @@ -1,11 +1,11 @@ package io.quarkus.ts.many.extensions; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; @Path("/resource/for") public class ResourceFor { diff --git a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceGentle.java b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceGentle.java index c9fa87fdd6..eb3eb53731 100644 --- a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceGentle.java +++ b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceGentle.java @@ -1,11 +1,11 @@ package io.quarkus.ts.many.extensions; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; @Path("/resource/gentle") public class ResourceGentle { diff --git a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceGlamorous.java b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceGlamorous.java index 0599183143..bdd137b077 100644 --- a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceGlamorous.java +++ b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceGlamorous.java @@ -1,11 +1,11 @@ package io.quarkus.ts.many.extensions; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; @Path("/resource/glamorous") public class ResourceGlamorous { diff --git a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceGrand.java b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceGrand.java index ac9e7c8bba..33681b8e23 100644 --- a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceGrand.java +++ b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceGrand.java @@ -1,11 +1,11 @@ package io.quarkus.ts.many.extensions; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; @Path("/resource/grand") public class ResourceGrand { diff --git a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceGroovy.java b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceGroovy.java index 3b507ff589..28869c9376 100644 --- a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceGroovy.java +++ b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceGroovy.java @@ -1,11 +1,11 @@ package io.quarkus.ts.many.extensions; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; @Path("/resource/groovy") public class ResourceGroovy { diff --git a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceHelpful.java b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceHelpful.java index 8d0ebee21c..cf074d21f2 100644 --- a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceHelpful.java +++ b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceHelpful.java @@ -1,11 +1,11 @@ package io.quarkus.ts.many.extensions; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; @Path("/resource/helpful") public class ResourceHelpful { diff --git a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceHunky.java b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceHunky.java index c2ea44cc9e..89f9d4e1b7 100644 --- a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceHunky.java +++ b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceHunky.java @@ -1,11 +1,11 @@ package io.quarkus.ts.many.extensions; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; @Path("/resource/hunky") public class ResourceHunky { diff --git a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceHushed.java b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceHushed.java index 4dbe3844cb..dc3610186a 100644 --- a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceHushed.java +++ b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceHushed.java @@ -1,11 +1,11 @@ package io.quarkus.ts.many.extensions; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; @Path("/resource/hushed") public class ResourceHushed { diff --git a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceInnocent.java b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceInnocent.java index cfd793f4d7..bff9974fb0 100644 --- a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceInnocent.java +++ b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceInnocent.java @@ -1,11 +1,11 @@ package io.quarkus.ts.many.extensions; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; @Path("/resource/innocent") public class ResourceInnocent { diff --git a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceLarge.java b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceLarge.java index b50401c4c0..e538314605 100644 --- a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceLarge.java +++ b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceLarge.java @@ -1,11 +1,11 @@ package io.quarkus.ts.many.extensions; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; @Path("/resource/large") public class ResourceLarge { diff --git a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceMany.java b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceMany.java index dfc941f58b..909a5cf53e 100644 --- a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceMany.java +++ b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceMany.java @@ -1,11 +1,11 @@ package io.quarkus.ts.many.extensions; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; @Path("/resource/many") public class ResourceMany { diff --git a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceMean.java b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceMean.java index af920b7a56..9be9503bce 100644 --- a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceMean.java +++ b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceMean.java @@ -1,11 +1,11 @@ package io.quarkus.ts.many.extensions; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; @Path("/resource/mean") public class ResourceMean { diff --git a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceMindless.java b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceMindless.java index 4b00d8883d..45bda1b39c 100644 --- a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceMindless.java +++ b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceMindless.java @@ -1,11 +1,11 @@ package io.quarkus.ts.many.extensions; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; @Path("/resource/mindless") public class ResourceMindless { diff --git a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceNaughty.java b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceNaughty.java index 03c0a70b85..668f938c32 100644 --- a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceNaughty.java +++ b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceNaughty.java @@ -1,11 +1,11 @@ package io.quarkus.ts.many.extensions; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; @Path("/resource/naughty") public class ResourceNaughty { diff --git a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceOafish.java b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceOafish.java index 90af8366c5..485d267958 100644 --- a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceOafish.java +++ b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceOafish.java @@ -1,11 +1,11 @@ package io.quarkus.ts.many.extensions; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; @Path("/resource/oafish") public class ResourceOafish { diff --git a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceObsolete.java b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceObsolete.java index 377ed1a0a0..5674550d62 100644 --- a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceObsolete.java +++ b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceObsolete.java @@ -1,11 +1,11 @@ package io.quarkus.ts.many.extensions; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; @Path("/resource/obsolete") public class ResourceObsolete { diff --git a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceOpposite.java b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceOpposite.java index 1c1cd8f541..c8a3be20f8 100644 --- a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceOpposite.java +++ b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceOpposite.java @@ -1,11 +1,11 @@ package io.quarkus.ts.many.extensions; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; @Path("/resource/opposite") public class ResourceOpposite { diff --git a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourcePacific.java b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourcePacific.java index 1af5691518..08ac913d10 100644 --- a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourcePacific.java +++ b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourcePacific.java @@ -1,11 +1,11 @@ package io.quarkus.ts.many.extensions; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; @Path("/resource/pacific") public class ResourcePacific { diff --git a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourcePanoramic.java b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourcePanoramic.java index 1ea6790f3b..674240026e 100644 --- a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourcePanoramic.java +++ b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourcePanoramic.java @@ -1,11 +1,11 @@ package io.quarkus.ts.many.extensions; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; @Path("/resource/panoramic") public class ResourcePanoramic { diff --git a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourcePassenger.java b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourcePassenger.java index 2ecbface1f..c848086067 100644 --- a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourcePassenger.java +++ b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourcePassenger.java @@ -1,11 +1,11 @@ package io.quarkus.ts.many.extensions; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; @Path("/resource/passenger") public class ResourcePassenger { diff --git a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourcePeachy.java b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourcePeachy.java index e46df48333..43c9746559 100644 --- a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourcePeachy.java +++ b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourcePeachy.java @@ -1,11 +1,11 @@ package io.quarkus.ts.many.extensions; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; @Path("/resource/peachy") public class ResourcePeachy { diff --git a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourcePossible.java b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourcePossible.java index 8a52e0e619..8e19c32a33 100644 --- a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourcePossible.java +++ b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourcePossible.java @@ -1,11 +1,11 @@ package io.quarkus.ts.many.extensions; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; @Path("/resource/possible") public class ResourcePossible { diff --git a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourcePrecious.java b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourcePrecious.java index 5804063385..5899e46705 100644 --- a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourcePrecious.java +++ b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourcePrecious.java @@ -1,11 +1,11 @@ package io.quarkus.ts.many.extensions; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; @Path("/resource/precious") public class ResourcePrecious { diff --git a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourcePrimo.java b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourcePrimo.java index 671e38d381..f72895ab28 100644 --- a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourcePrimo.java +++ b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourcePrimo.java @@ -1,11 +1,11 @@ package io.quarkus.ts.many.extensions; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; @Path("/resource/primo") public class ResourcePrimo { diff --git a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceRecondite.java b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceRecondite.java index 751882e23b..df580cb6a0 100644 --- a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceRecondite.java +++ b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceRecondite.java @@ -1,11 +1,11 @@ package io.quarkus.ts.many.extensions; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; @Path("/resource/recondite") public class ResourceRecondite { diff --git a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceRelieved.java b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceRelieved.java index 76c4cc6d22..888f3ae538 100644 --- a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceRelieved.java +++ b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceRelieved.java @@ -1,11 +1,11 @@ package io.quarkus.ts.many.extensions; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; @Path("/resource/relieved") public class ResourceRelieved { diff --git a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceRoof.java b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceRoof.java index fcb339d31d..e29bdbba88 100644 --- a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceRoof.java +++ b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceRoof.java @@ -1,11 +1,11 @@ package io.quarkus.ts.many.extensions; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; @Path("/resource/roof") public class ResourceRoof { diff --git a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceSable.java b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceSable.java index b8830be827..f7e2c98ad5 100644 --- a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceSable.java +++ b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceSable.java @@ -1,11 +1,11 @@ package io.quarkus.ts.many.extensions; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; @Path("/resource/sable") public class ResourceSable { diff --git a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceShaggy.java b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceShaggy.java index e2b2c33ea5..e0176282ad 100644 --- a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceShaggy.java +++ b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceShaggy.java @@ -1,11 +1,11 @@ package io.quarkus.ts.many.extensions; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; @Path("/resource/shaggy") public class ResourceShaggy { diff --git a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceShowy.java b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceShowy.java index 6645ba85b2..b712a1f3ca 100644 --- a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceShowy.java +++ b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceShowy.java @@ -1,11 +1,11 @@ package io.quarkus.ts.many.extensions; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; @Path("/resource/showy") public class ResourceShowy { diff --git a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceSlim.java b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceSlim.java index 25152eb144..8210319536 100644 --- a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceSlim.java +++ b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceSlim.java @@ -1,11 +1,11 @@ package io.quarkus.ts.many.extensions; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; @Path("/resource/slim") public class ResourceSlim { diff --git a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceSmelly.java b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceSmelly.java index 824ff45051..e3e8d2ca35 100644 --- a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceSmelly.java +++ b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceSmelly.java @@ -1,11 +1,11 @@ package io.quarkus.ts.many.extensions; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; @Path("/resource/smelly") public class ResourceSmelly { diff --git a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceSmooth.java b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceSmooth.java index 7f40a23635..c8564286a3 100644 --- a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceSmooth.java +++ b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceSmooth.java @@ -1,11 +1,11 @@ package io.quarkus.ts.many.extensions; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; @Path("/resource/smooth") public class ResourceSmooth { diff --git a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceSqualid.java b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceSqualid.java index 3f274ec2b1..fa2cbd7d61 100644 --- a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceSqualid.java +++ b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceSqualid.java @@ -1,11 +1,11 @@ package io.quarkus.ts.many.extensions; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; @Path("/resource/squalid") public class ResourceSqualid { diff --git a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceSteady.java b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceSteady.java index c61c51af42..45f3788415 100644 --- a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceSteady.java +++ b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceSteady.java @@ -1,11 +1,11 @@ package io.quarkus.ts.many.extensions; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; @Path("/resource/steady") public class ResourceSteady { diff --git a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceSteep.java b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceSteep.java index 2bf1391ce8..4abefda3b5 100644 --- a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceSteep.java +++ b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceSteep.java @@ -1,11 +1,11 @@ package io.quarkus.ts.many.extensions; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; @Path("/resource/steep") public class ResourceSteep { diff --git a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceStraight.java b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceStraight.java index 72c75cbb8d..f01b7cde0a 100644 --- a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceStraight.java +++ b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceStraight.java @@ -1,11 +1,11 @@ package io.quarkus.ts.many.extensions; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; @Path("/resource/straight") public class ResourceStraight { diff --git a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceSunny.java b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceSunny.java index eb09583fa3..8115ce4cbc 100644 --- a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceSunny.java +++ b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceSunny.java @@ -1,11 +1,11 @@ package io.quarkus.ts.many.extensions; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; @Path("/resource/sunny") public class ResourceSunny { diff --git a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceTame.java b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceTame.java index 4a8414095d..3edde49c2d 100644 --- a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceTame.java +++ b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceTame.java @@ -1,11 +1,11 @@ package io.quarkus.ts.many.extensions; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; @Path("/resource/tame") public class ResourceTame { diff --git a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceTremendous.java b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceTremendous.java index 82a09c3a26..cdadd1937c 100644 --- a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceTremendous.java +++ b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceTremendous.java @@ -1,11 +1,11 @@ package io.quarkus.ts.many.extensions; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; @Path("/resource/tremendous") public class ResourceTremendous { diff --git a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceTricky.java b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceTricky.java index 301a86b6f4..3e0f31aecf 100644 --- a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceTricky.java +++ b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceTricky.java @@ -1,11 +1,11 @@ package io.quarkus.ts.many.extensions; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; @Path("/resource/tricky") public class ResourceTricky { diff --git a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceUnnatural.java b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceUnnatural.java index 161f93b19a..122ce33a90 100644 --- a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceUnnatural.java +++ b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceUnnatural.java @@ -1,11 +1,11 @@ package io.quarkus.ts.many.extensions; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; @Path("/resource/unnatural") public class ResourceUnnatural { diff --git a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceWrathful.java b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceWrathful.java index 7efe61251b..2fbf178780 100644 --- a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceWrathful.java +++ b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceWrathful.java @@ -1,11 +1,11 @@ package io.quarkus.ts.many.extensions; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; @Path("/resource/wrathful") public class ResourceWrathful { diff --git a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceZany.java b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceZany.java index 3bf7efc4aa..85a2fd96dd 100644 --- a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceZany.java +++ b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ResourceZany.java @@ -1,11 +1,11 @@ package io.quarkus.ts.many.extensions; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; @Path("/resource/zany") public class ResourceZany { diff --git a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceAdorable.java b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceAdorable.java index f97f1f26b4..8a2a8f20d5 100644 --- a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceAdorable.java +++ b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceAdorable.java @@ -1,6 +1,6 @@ package io.quarkus.ts.many.extensions; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class ServiceAdorable { diff --git a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceAmbitious.java b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceAmbitious.java index 03679f93ab..8155d89986 100644 --- a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceAmbitious.java +++ b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceAmbitious.java @@ -1,6 +1,6 @@ package io.quarkus.ts.many.extensions; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class ServiceAmbitious { diff --git a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceAmused.java b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceAmused.java index a7d75f6e8f..403bb421ea 100644 --- a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceAmused.java +++ b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceAmused.java @@ -1,6 +1,6 @@ package io.quarkus.ts.many.extensions; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class ServiceAmused { diff --git a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceAquatic.java b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceAquatic.java index 4d66d3c0cb..11953750b4 100644 --- a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceAquatic.java +++ b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceAquatic.java @@ -1,6 +1,6 @@ package io.quarkus.ts.many.extensions; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class ServiceAquatic { diff --git a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceAxiomatic.java b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceAxiomatic.java index 6dcc7f673e..28c5b65d7a 100644 --- a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceAxiomatic.java +++ b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceAxiomatic.java @@ -1,6 +1,6 @@ package io.quarkus.ts.many.extensions; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class ServiceAxiomatic { diff --git a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceBustling.java b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceBustling.java index 071b883a51..99d6863255 100644 --- a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceBustling.java +++ b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceBustling.java @@ -1,6 +1,6 @@ package io.quarkus.ts.many.extensions; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class ServiceBustling { diff --git a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceCertain.java b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceCertain.java index 1b2f18c445..97a92ea9c5 100644 --- a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceCertain.java +++ b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceCertain.java @@ -1,6 +1,6 @@ package io.quarkus.ts.many.extensions; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class ServiceCertain { diff --git a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceClammy.java b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceClammy.java index faa906e271..0766ab8d2d 100644 --- a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceClammy.java +++ b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceClammy.java @@ -1,6 +1,6 @@ package io.quarkus.ts.many.extensions; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class ServiceClammy { diff --git a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceDirty.java b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceDirty.java index 2b7199e13e..bbd074592c 100644 --- a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceDirty.java +++ b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceDirty.java @@ -1,6 +1,6 @@ package io.quarkus.ts.many.extensions; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class ServiceDirty { diff --git a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceDisastrous.java b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceDisastrous.java index f085a13792..a8d16b5506 100644 --- a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceDisastrous.java +++ b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceDisastrous.java @@ -1,6 +1,6 @@ package io.quarkus.ts.many.extensions; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class ServiceDisastrous { diff --git a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceDisgusting.java b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceDisgusting.java index 71285b1ff8..edf74824a8 100644 --- a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceDisgusting.java +++ b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceDisgusting.java @@ -1,6 +1,6 @@ package io.quarkus.ts.many.extensions; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class ServiceDisgusting { diff --git a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceDistinct.java b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceDistinct.java index cbeb6e75a1..d127d17605 100644 --- a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceDistinct.java +++ b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceDistinct.java @@ -1,6 +1,6 @@ package io.quarkus.ts.many.extensions; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class ServiceDistinct { diff --git a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceFalse.java b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceFalse.java index 3043b916fc..35606a59d3 100644 --- a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceFalse.java +++ b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceFalse.java @@ -1,6 +1,6 @@ package io.quarkus.ts.many.extensions; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class ServiceFalse { diff --git a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceFeigned.java b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceFeigned.java index 5e82e30c86..cacc44684e 100644 --- a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceFeigned.java +++ b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceFeigned.java @@ -1,6 +1,6 @@ package io.quarkus.ts.many.extensions; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class ServiceFeigned { diff --git a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceFlagrant.java b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceFlagrant.java index e95c993778..def9bc6c4d 100644 --- a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceFlagrant.java +++ b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceFlagrant.java @@ -1,6 +1,6 @@ package io.quarkus.ts.many.extensions; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class ServiceFlagrant { diff --git a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceFor.java b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceFor.java index 2168cc663a..2317a75c04 100644 --- a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceFor.java +++ b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceFor.java @@ -1,6 +1,6 @@ package io.quarkus.ts.many.extensions; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class ServiceFor { diff --git a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceGentle.java b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceGentle.java index 8cb7cffbdb..4ab912872e 100644 --- a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceGentle.java +++ b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceGentle.java @@ -1,6 +1,6 @@ package io.quarkus.ts.many.extensions; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class ServiceGentle { diff --git a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceGlamorous.java b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceGlamorous.java index 5e17e987b6..f348a43938 100644 --- a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceGlamorous.java +++ b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceGlamorous.java @@ -1,6 +1,6 @@ package io.quarkus.ts.many.extensions; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class ServiceGlamorous { diff --git a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceGrand.java b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceGrand.java index 4509189c68..f7ae30c43b 100644 --- a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceGrand.java +++ b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceGrand.java @@ -1,6 +1,6 @@ package io.quarkus.ts.many.extensions; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class ServiceGrand { diff --git a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceGroovy.java b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceGroovy.java index daae6caa99..66d9bf71cf 100644 --- a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceGroovy.java +++ b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceGroovy.java @@ -1,6 +1,6 @@ package io.quarkus.ts.many.extensions; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class ServiceGroovy { diff --git a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceHelpful.java b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceHelpful.java index 45e8bc44c9..52a50e77c3 100644 --- a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceHelpful.java +++ b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceHelpful.java @@ -1,6 +1,6 @@ package io.quarkus.ts.many.extensions; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class ServiceHelpful { diff --git a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceHunky.java b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceHunky.java index 3a3b70d324..4fac8573ec 100644 --- a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceHunky.java +++ b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceHunky.java @@ -1,6 +1,6 @@ package io.quarkus.ts.many.extensions; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class ServiceHunky { diff --git a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceHushed.java b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceHushed.java index c463eccabe..819f83565f 100644 --- a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceHushed.java +++ b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceHushed.java @@ -1,6 +1,6 @@ package io.quarkus.ts.many.extensions; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class ServiceHushed { diff --git a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceInnocent.java b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceInnocent.java index 7610395a2b..57cf021b47 100644 --- a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceInnocent.java +++ b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceInnocent.java @@ -1,6 +1,6 @@ package io.quarkus.ts.many.extensions; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class ServiceInnocent { diff --git a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceLarge.java b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceLarge.java index 2c507a8fdd..2673c84e7b 100644 --- a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceLarge.java +++ b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceLarge.java @@ -1,6 +1,6 @@ package io.quarkus.ts.many.extensions; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class ServiceLarge { diff --git a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceMany.java b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceMany.java index 4f6e55675f..e560f34fdd 100644 --- a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceMany.java +++ b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceMany.java @@ -1,6 +1,6 @@ package io.quarkus.ts.many.extensions; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class ServiceMany { diff --git a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceMean.java b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceMean.java index 509f834273..bfb676d3f5 100644 --- a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceMean.java +++ b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceMean.java @@ -1,6 +1,6 @@ package io.quarkus.ts.many.extensions; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class ServiceMean { diff --git a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceMindless.java b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceMindless.java index 473fac7997..ddc576acff 100644 --- a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceMindless.java +++ b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceMindless.java @@ -1,6 +1,6 @@ package io.quarkus.ts.many.extensions; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class ServiceMindless { diff --git a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceNaughty.java b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceNaughty.java index f6eb871ffa..90fb9c856b 100644 --- a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceNaughty.java +++ b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceNaughty.java @@ -1,6 +1,6 @@ package io.quarkus.ts.many.extensions; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class ServiceNaughty { diff --git a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceOafish.java b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceOafish.java index e58b5ceac9..52aca3afc5 100644 --- a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceOafish.java +++ b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceOafish.java @@ -1,6 +1,6 @@ package io.quarkus.ts.many.extensions; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class ServiceOafish { diff --git a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceObsolete.java b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceObsolete.java index 0214f86a29..b244fc209c 100644 --- a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceObsolete.java +++ b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceObsolete.java @@ -1,6 +1,6 @@ package io.quarkus.ts.many.extensions; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class ServiceObsolete { diff --git a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceOpposite.java b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceOpposite.java index 2090dba29a..a17859abb6 100644 --- a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceOpposite.java +++ b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceOpposite.java @@ -1,6 +1,6 @@ package io.quarkus.ts.many.extensions; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class ServiceOpposite { diff --git a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServicePacific.java b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServicePacific.java index 46d1c1831a..c072cafb96 100644 --- a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServicePacific.java +++ b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServicePacific.java @@ -1,6 +1,6 @@ package io.quarkus.ts.many.extensions; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class ServicePacific { diff --git a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServicePanoramic.java b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServicePanoramic.java index 7a78972630..eeff7e731d 100644 --- a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServicePanoramic.java +++ b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServicePanoramic.java @@ -1,6 +1,6 @@ package io.quarkus.ts.many.extensions; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class ServicePanoramic { diff --git a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServicePassenger.java b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServicePassenger.java index a69f221f54..d30eea7030 100644 --- a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServicePassenger.java +++ b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServicePassenger.java @@ -1,6 +1,6 @@ package io.quarkus.ts.many.extensions; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class ServicePassenger { diff --git a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServicePeachy.java b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServicePeachy.java index 378927bc49..44628670f3 100644 --- a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServicePeachy.java +++ b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServicePeachy.java @@ -1,6 +1,6 @@ package io.quarkus.ts.many.extensions; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class ServicePeachy { diff --git a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServicePossible.java b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServicePossible.java index b2bf5d949c..f9780c617e 100644 --- a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServicePossible.java +++ b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServicePossible.java @@ -1,6 +1,6 @@ package io.quarkus.ts.many.extensions; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class ServicePossible { diff --git a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServicePrecious.java b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServicePrecious.java index a83afe0556..77764d4e87 100644 --- a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServicePrecious.java +++ b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServicePrecious.java @@ -1,6 +1,6 @@ package io.quarkus.ts.many.extensions; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class ServicePrecious { diff --git a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServicePrimo.java b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServicePrimo.java index 860eebb324..e0154dcd19 100644 --- a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServicePrimo.java +++ b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServicePrimo.java @@ -1,6 +1,6 @@ package io.quarkus.ts.many.extensions; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class ServicePrimo { diff --git a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceRecondite.java b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceRecondite.java index 93ce29d9ae..5f17a85a57 100644 --- a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceRecondite.java +++ b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceRecondite.java @@ -1,6 +1,6 @@ package io.quarkus.ts.many.extensions; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class ServiceRecondite { diff --git a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceRelieved.java b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceRelieved.java index 395e3a05c9..1aa5448262 100644 --- a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceRelieved.java +++ b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceRelieved.java @@ -1,6 +1,6 @@ package io.quarkus.ts.many.extensions; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class ServiceRelieved { diff --git a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceRoof.java b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceRoof.java index 3d13c91855..26c9d2fd8f 100644 --- a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceRoof.java +++ b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceRoof.java @@ -1,6 +1,6 @@ package io.quarkus.ts.many.extensions; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class ServiceRoof { diff --git a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceSable.java b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceSable.java index 62a305ed19..a70cedecc9 100644 --- a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceSable.java +++ b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceSable.java @@ -1,6 +1,6 @@ package io.quarkus.ts.many.extensions; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class ServiceSable { diff --git a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceShaggy.java b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceShaggy.java index 598ae60153..8b5b395a28 100644 --- a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceShaggy.java +++ b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceShaggy.java @@ -1,6 +1,6 @@ package io.quarkus.ts.many.extensions; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class ServiceShaggy { diff --git a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceShowy.java b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceShowy.java index fe330db77f..33343e2f92 100644 --- a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceShowy.java +++ b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceShowy.java @@ -1,6 +1,6 @@ package io.quarkus.ts.many.extensions; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class ServiceShowy { diff --git a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceSlim.java b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceSlim.java index c262b3d6c2..ced00a940f 100644 --- a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceSlim.java +++ b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceSlim.java @@ -1,6 +1,6 @@ package io.quarkus.ts.many.extensions; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class ServiceSlim { diff --git a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceSmelly.java b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceSmelly.java index 4b11496ac0..4a64e9a51b 100644 --- a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceSmelly.java +++ b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceSmelly.java @@ -1,6 +1,6 @@ package io.quarkus.ts.many.extensions; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class ServiceSmelly { diff --git a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceSmooth.java b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceSmooth.java index 26e405dfe9..a5ca040b9d 100644 --- a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceSmooth.java +++ b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceSmooth.java @@ -1,6 +1,6 @@ package io.quarkus.ts.many.extensions; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class ServiceSmooth { diff --git a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceSqualid.java b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceSqualid.java index fe97d3f930..80129b53a9 100644 --- a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceSqualid.java +++ b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceSqualid.java @@ -1,6 +1,6 @@ package io.quarkus.ts.many.extensions; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class ServiceSqualid { diff --git a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceSteady.java b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceSteady.java index baf8cf85f0..d38986fe15 100644 --- a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceSteady.java +++ b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceSteady.java @@ -1,6 +1,6 @@ package io.quarkus.ts.many.extensions; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class ServiceSteady { diff --git a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceSteep.java b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceSteep.java index b6523d87b7..94c465b175 100644 --- a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceSteep.java +++ b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceSteep.java @@ -1,6 +1,6 @@ package io.quarkus.ts.many.extensions; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class ServiceSteep { diff --git a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceStraight.java b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceStraight.java index 5365275388..588e8bba6a 100644 --- a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceStraight.java +++ b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceStraight.java @@ -1,6 +1,6 @@ package io.quarkus.ts.many.extensions; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class ServiceStraight { diff --git a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceSunny.java b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceSunny.java index e2a0c49aeb..60f4e508d6 100644 --- a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceSunny.java +++ b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceSunny.java @@ -1,6 +1,6 @@ package io.quarkus.ts.many.extensions; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class ServiceSunny { diff --git a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceTame.java b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceTame.java index 036bbc922d..8c08ef00d0 100644 --- a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceTame.java +++ b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceTame.java @@ -1,6 +1,6 @@ package io.quarkus.ts.many.extensions; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class ServiceTame { diff --git a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceTremendous.java b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceTremendous.java index 56e6607c57..f088b975ca 100644 --- a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceTremendous.java +++ b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceTremendous.java @@ -1,6 +1,6 @@ package io.quarkus.ts.many.extensions; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class ServiceTremendous { diff --git a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceTricky.java b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceTricky.java index eae61b954b..aa0f67286a 100644 --- a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceTricky.java +++ b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceTricky.java @@ -1,6 +1,6 @@ package io.quarkus.ts.many.extensions; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class ServiceTricky { diff --git a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceUnnatural.java b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceUnnatural.java index f1895a78f1..c003b788f9 100644 --- a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceUnnatural.java +++ b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceUnnatural.java @@ -1,6 +1,6 @@ package io.quarkus.ts.many.extensions; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class ServiceUnnatural { diff --git a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceWrathful.java b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceWrathful.java index f5fa19a535..414b4c8b2d 100644 --- a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceWrathful.java +++ b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceWrathful.java @@ -1,6 +1,6 @@ package io.quarkus.ts.many.extensions; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class ServiceWrathful { diff --git a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceZany.java b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceZany.java index 254df60a72..f334d69ae1 100644 --- a/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceZany.java +++ b/super-size/many-extensions/src/main/java/io/quarkus/ts/many/extensions/ServiceZany.java @@ -1,6 +1,6 @@ package io.quarkus.ts.many.extensions; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class ServiceZany { diff --git a/websockets/quarkus-websockets/src/main/java/io/quarkus/ts/websockets/producer/Chat.java b/websockets/quarkus-websockets/src/main/java/io/quarkus/ts/websockets/producer/Chat.java index 017d5ee968..9b1fd8e367 100644 --- a/websockets/quarkus-websockets/src/main/java/io/quarkus/ts/websockets/producer/Chat.java +++ b/websockets/quarkus-websockets/src/main/java/io/quarkus/ts/websockets/producer/Chat.java @@ -3,14 +3,14 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import javax.enterprise.context.ApplicationScoped; -import javax.websocket.OnClose; -import javax.websocket.OnError; -import javax.websocket.OnMessage; -import javax.websocket.OnOpen; -import javax.websocket.Session; -import javax.websocket.server.PathParam; -import javax.websocket.server.ServerEndpoint; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.websocket.OnClose; +import jakarta.websocket.OnError; +import jakarta.websocket.OnMessage; +import jakarta.websocket.OnOpen; +import jakarta.websocket.Session; +import jakarta.websocket.server.PathParam; +import jakarta.websocket.server.ServerEndpoint; import org.jboss.logging.Logger; diff --git a/websockets/quarkus-websockets/src/main/java/io/quarkus/ts/websockets/producer/Pusher.java b/websockets/quarkus-websockets/src/main/java/io/quarkus/ts/websockets/producer/Pusher.java index 91c3b76fea..6ee369989d 100644 --- a/websockets/quarkus-websockets/src/main/java/io/quarkus/ts/websockets/producer/Pusher.java +++ b/websockets/quarkus-websockets/src/main/java/io/quarkus/ts/websockets/producer/Pusher.java @@ -4,12 +4,12 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -import javax.enterprise.context.ApplicationScoped; -import javax.websocket.OnMessage; -import javax.websocket.OnOpen; -import javax.websocket.RemoteEndpoint; -import javax.websocket.Session; -import javax.websocket.server.ServerEndpoint; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.websocket.OnMessage; +import jakarta.websocket.OnOpen; +import jakarta.websocket.RemoteEndpoint; +import jakarta.websocket.Session; +import jakarta.websocket.server.ServerEndpoint; import org.jboss.logging.Logger; diff --git a/websockets/quarkus-websockets/src/test/java/io/quarkus/ts/websockets/producer/WebSocketsProducerConsumerIT.java b/websockets/quarkus-websockets/src/test/java/io/quarkus/ts/websockets/producer/WebSocketsProducerConsumerIT.java index 2a15b84a2d..bbdf601634 100644 --- a/websockets/quarkus-websockets/src/test/java/io/quarkus/ts/websockets/producer/WebSocketsProducerConsumerIT.java +++ b/websockets/quarkus-websockets/src/test/java/io/quarkus/ts/websockets/producer/WebSocketsProducerConsumerIT.java @@ -8,12 +8,12 @@ import java.util.concurrent.LinkedBlockingDeque; import java.util.concurrent.TimeUnit; -import javax.websocket.ClientEndpoint; -import javax.websocket.ContainerProvider; -import javax.websocket.DeploymentException; -import javax.websocket.OnMessage; -import javax.websocket.OnOpen; -import javax.websocket.Session; +import jakarta.websocket.ClientEndpoint; +import jakarta.websocket.ContainerProvider; +import jakarta.websocket.DeploymentException; +import jakarta.websocket.OnMessage; +import jakarta.websocket.OnOpen; +import jakarta.websocket.Session; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/websockets/websockets-client/src/main/java/io/quarkus/ts/websockets/client/Chat.java b/websockets/websockets-client/src/main/java/io/quarkus/ts/websockets/client/Chat.java index c7f04ea03e..34b9fff195 100644 --- a/websockets/websockets-client/src/main/java/io/quarkus/ts/websockets/client/Chat.java +++ b/websockets/websockets-client/src/main/java/io/quarkus/ts/websockets/client/Chat.java @@ -3,14 +3,14 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import javax.enterprise.context.ApplicationScoped; -import javax.websocket.OnClose; -import javax.websocket.OnError; -import javax.websocket.OnMessage; -import javax.websocket.OnOpen; -import javax.websocket.Session; -import javax.websocket.server.PathParam; -import javax.websocket.server.ServerEndpoint; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.websocket.OnClose; +import jakarta.websocket.OnError; +import jakarta.websocket.OnMessage; +import jakarta.websocket.OnOpen; +import jakarta.websocket.Session; +import jakarta.websocket.server.PathParam; +import jakarta.websocket.server.ServerEndpoint; import org.jboss.logging.Logger; diff --git a/websockets/websockets-client/src/main/java/io/quarkus/ts/websockets/client/Pusher.java b/websockets/websockets-client/src/main/java/io/quarkus/ts/websockets/client/Pusher.java index 5d4172a10c..38c3e1d1be 100644 --- a/websockets/websockets-client/src/main/java/io/quarkus/ts/websockets/client/Pusher.java +++ b/websockets/websockets-client/src/main/java/io/quarkus/ts/websockets/client/Pusher.java @@ -4,12 +4,12 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -import javax.enterprise.context.ApplicationScoped; -import javax.websocket.OnMessage; -import javax.websocket.OnOpen; -import javax.websocket.RemoteEndpoint; -import javax.websocket.Session; -import javax.websocket.server.ServerEndpoint; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.websocket.OnMessage; +import jakarta.websocket.OnOpen; +import jakarta.websocket.RemoteEndpoint; +import jakarta.websocket.Session; +import jakarta.websocket.server.ServerEndpoint; import org.jboss.logging.Logger; diff --git a/websockets/websockets-client/src/main/java/io/quarkus/ts/websockets/client/RemoteClient.java b/websockets/websockets-client/src/main/java/io/quarkus/ts/websockets/client/RemoteClient.java index a9580879ee..07c150f866 100644 --- a/websockets/websockets-client/src/main/java/io/quarkus/ts/websockets/client/RemoteClient.java +++ b/websockets/websockets-client/src/main/java/io/quarkus/ts/websockets/client/RemoteClient.java @@ -8,16 +8,16 @@ import java.util.concurrent.LinkedBlockingDeque; import java.util.concurrent.TimeUnit; -import javax.enterprise.context.ApplicationScoped; -import javax.websocket.ClientEndpoint; -import javax.websocket.ContainerProvider; -import javax.websocket.DeploymentException; -import javax.websocket.OnMessage; -import javax.websocket.OnOpen; -import javax.websocket.Session; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.websocket.ClientEndpoint; +import jakarta.websocket.ContainerProvider; +import jakarta.websocket.DeploymentException; +import jakarta.websocket.OnMessage; +import jakarta.websocket.OnOpen; +import jakarta.websocket.Session; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; import org.eclipse.microprofile.config.inject.ConfigProperty;