Bump FW to 1.3.0.Beta4, migrate to Jakarta and disable javax tests

Disables messaging/qpid till quarkus-qpid-jms that uses Jakarta is released. Also disables external application tests till external projects (QS, Workshops, Todo app) migrates to Jakarta (that's till they use Quarkus 3+). Javax stuff is migrated to Jakarta and FW bumped to 1.3.0.Beta4 that also sports jakarta. Changes in Panache Hibernate Reactive module are forced by quarkusio/quarkus#29761
michalvavrik · Feb 11, 2023 · a787a6f · a787a6f
1 parent 35553bb
commit a787a6f
Show file tree

Hide file tree

Showing 665 changed files with 2,729 additions and 2,688 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/.../src/main/java/io/quarkus/ts/configmap/api/server/secrets/InjectedProperitesResource.java b/.../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
@@ -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
@@ -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
@@ -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
@@ -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/...applications/src/test/java/io/quarkus/ts/external/applications/OpenShiftQuickstartIT.java b/...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/...l-applications/src/test/java/io/quarkus/ts/external/applications/OpenShiftTodoDemoIT.java b/...l-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/...ications/src/test/java/io/quarkus/ts/external/applications/OpenShiftWorkshopHeroesIT.java b/...ications/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/...ations/src/test/java/io/quarkus/ts/external/applications/OpenShiftWorkshopVillainsIT.java b/...ations/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
@@ -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
@@ -1,18 +1,21 @@
 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;
 import io.quarkus.test.scenarios.QuarkusScenario;
 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
@@ -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/...ative-events/src/main/java/io/quarkus/ts/funqy/knativeevents/FunctionValidationChain.java b/...ative-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/...ve-events/src/main/java/io/quarkus/ts/funqy/knativeevents/ValidationResultRepository.java b/...ve-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
@@ -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/...t/java/io/quarkus/ts/funqy/knativeevents/ServerlessExtensionOpenShiftFunqyKnEventsIT.java b/...t/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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/...lidator/src/test/java/io/quarkus/ts/http/hibernate/validator/sources/ClassicResource.java b/...lidator/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 {